[release-4.15] OCPBUGS-30141: ClusterRoleBinding + Service SSA cherry-pick #707

dtfranz · 2024-03-01T18:28:18Z

Manual cherry-pick of 978852d from #706

Upstream-repository: operator-lifecycle-manager
Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

… SSA in order to avoid race conditions. (#3182) Signed-off-by: Daniel Franz <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

openshift-ci-robot · 2024-03-01T18:28:23Z

@dtfranz: This pull request references Jira Issue OCPBUGS-30141, which is invalid:

expected Jira Issue OCPBUGS-30141 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

Manual cherry-pick of 978852d from #706

Upstream-repository: operator-lifecycle-manager
Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

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.

dtfranz · 2024-03-01T18:29:15Z

/jira refresh

openshift-ci-robot · 2024-03-01T18:29:23Z

@dtfranz: This pull request references Jira Issue OCPBUGS-30141, 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.15.z) matches configured target version for branch (4.15.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-24009 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-24009 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

/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.

kuiwang02 · 2024-03-04T00:43:53Z

/payload-aggregate periodic-ci-openshift-release-master-ci-4.15-upgrade-from-stable-4.14-e2e-azure-sdn-upgrade 10

openshift-ci · 2024-03-04T00:43:56Z

@kuiwang02: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.15-upgrade-from-stable-4.14-e2e-azure-sdn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/46cf19f0-d9c0-11ee-9871-3081d055a6be-0

kuiwang02 · 2024-03-04T00:44:26Z

/hold
for pre-testing. thanks

kuiwang02 · 2024-03-04T05:21:57Z

/unhold

kuiwang02 · 2024-03-04T05:22:36Z

/label cherry-pick-approved
/label qe-approved

openshift-ci-robot · 2024-03-04T05:22:43Z

@dtfranz: This pull request references Jira Issue OCPBUGS-30141, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.z) matches configured target version for branch (4.15.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-24009 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-24009 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

Manual cherry-pick of 978852d from #706

Upstream-repository: operator-lifecycle-manager
Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

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.

kevinrizza · 2024-03-04T13:06:05Z

/approve
/label backport-risk-assessed

openshift-ci · 2024-03-04T13:06:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtfranz, kevinrizza

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:

~~DOWNSTREAM_OWNERS~~ [kevinrizza]

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

kevinrizza · 2024-03-04T14:48:12Z

/lgtm

openshift-ci · 2024-03-04T18:04:47Z

@dtfranz: 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 · 2024-03-04T18:06:40Z

@dtfranz: Jira Issue OCPBUGS-30141: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#707

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

In response to this:

Manual cherry-pick of 978852d from #706

Upstream-repository: operator-lifecycle-manager
Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

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 · 2024-03-04T21:04:27Z

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202403042028.p0.g9537a6a.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

openshift-cherrypick-robot · 2024-12-02T18:08:39Z

@dtfranz: cannot checkout 4.14: error checking out "4.14": exit status 1 error: pathspec '4.14' did not match any file(s) known to git

In response to this:

/cherry-pick 4.14

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-sigs/prow repository.

dtfranz · 2024-12-02T18:10:17Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2024-12-02T18:10:58Z

@dtfranz: #707 failed to apply on top of branch "release-4.14":

Applying: Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	staging/operator-lifecycle-manager/pkg/controller/install/certresources_test.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
M	staging/operator-lifecycle-manager/pkg/lib/ownerutil/util.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil/util.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil/util.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
Auto-merging staging/operator-lifecycle-manager/pkg/lib/ownerutil/util.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/install/certresources_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

In response to this:

/cherry-pick release-4.14

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-sigs/prow repository.

Modify installation steps for ClusterRoleBindings and Services to use…

af14835

… SSA in order to avoid race conditions. (#3182) Signed-off-by: Daniel Franz <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 1, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 1, 2024

openshift-ci bot requested review from kuiwang02, ankitathomas and dinhxuanvu March 1, 2024 18:29

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 4, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 4, 2024

openshift-ci bot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. qe-approved Signifies that QE has signed off on this PR labels Mar 4, 2024

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 4, 2024

openshift-ci bot assigned bandrade, emmajiafan, jianzhangbjz, KeenonLee, kuiwang02 and Xia-Zhao-rh Mar 4, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024

openshift-ci bot assigned kevinrizza Mar 4, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2024

openshift-merge-bot bot merged commit 9537a6a into openshift:release-4.15 Mar 4, 2024

dtfranz mentioned this pull request Dec 3, 2024

[release-4.14] OCPBUGS-45080: SSA for Services and ClusterRoleBindings #905

Merged

[release-4.15] OCPBUGS-30141: ClusterRoleBinding + Service SSA cherry-pick #707

[release-4.15] OCPBUGS-30141: ClusterRoleBinding + Service SSA cherry-pick #707

Uh oh!

Conversation

dtfranz commented Mar 1, 2024

Uh oh!

openshift-ci-robot commented Mar 1, 2024

Uh oh!

dtfranz commented Mar 1, 2024

Uh oh!

openshift-ci-robot commented Mar 1, 2024

Uh oh!

kuiwang02 commented Mar 4, 2024

Uh oh!

openshift-ci bot commented Mar 4, 2024

Uh oh!

kuiwang02 commented Mar 4, 2024

Uh oh!

kuiwang02 commented Mar 4, 2024

Uh oh!

kuiwang02 commented Mar 4, 2024

Uh oh!

openshift-ci-robot commented Mar 4, 2024

Uh oh!

kevinrizza commented Mar 4, 2024

Uh oh!

openshift-ci bot commented Mar 4, 2024

Uh oh!

kevinrizza commented Mar 4, 2024

Uh oh!

openshift-ci bot commented Mar 4, 2024

Uh oh!

openshift-ci-robot commented Mar 4, 2024

Uh oh!

openshift-bot commented Mar 4, 2024

Uh oh!

openshift-cherrypick-robot commented Dec 2, 2024

Uh oh!

dtfranz commented Dec 2, 2024

Uh oh!

openshift-cherrypick-robot commented Dec 2, 2024

Uh oh!

Uh oh!