[release-4.14] OCPBUGS-28989: pkg/storage/s3: enable bucket key on encryption settings

[openshift-cherrypick-robot]

This is an automated cherry-pick of #994

/assign flavianmissi

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-28830 has been cloned as Jira Issue OCPBUGS-28989. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-28989: pkg/storage/s3: enable bucket key on encryption settings

In response to this:

This is an automated cherry-pick of #994

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-28989, which is invalid:

• expected dependent Jira Issue OCPBUGS-28830 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #994

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[flavianmissi]

/lgtm
/label backport-risk-assessed

let's give the 4.15 backport some time to make sure everything is working as it should. I'll remove the hold after a couple days.
/hold

[flavianmissi]

/assign @wewang58

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavianmissi, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [flavianmissi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[wewang58]

/label cherry-pick-approved

[flavianmissi]

/retest

[flavianmissi]

/hold cancel
/jira refresh

[openshift-ci-robot]

@flavianmissi: This pull request references Jira Issue OCPBUGS-28989, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-28830 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-28830 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @xiuwang

In response to this:

/hold cancel
/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-28989: All pull requests linked via external trackers have merged:

• openshift/cluster-image-registry-operator#995

Jira Issue OCPBUGS-28989 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #994

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-image-registry-operator-container-v4.14.0-202402221739.p0.gecff686.assembly.stream.el8 for distgit ose-cluster-image-registry-operator.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.14.0-0.nightly-2024-02-22-202606

[flavianmissi]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

@flavianmissi: #995 failed to apply on top of branch "release-4.13":

Applying: pkg/storage/s3: enable bucket key on encryption settings
Using index info to reconstruct a base tree...
M	pkg/storage/s3/s3.go
M	test/e2e/aws_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/aws_test.go
CONFLICT (content): Merge conflict in test/e2e/aws_test.go
Auto-merging pkg/storage/s3/s3.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/storage/s3: enable bucket key on encryption settings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.