Skip to content

OCPBUGS-19789: Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups [release-4.14] #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Oct 31, 2023
Merged

OCPBUGS-19789: Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups [release-4.14] #566

merged 3 commits into from
Oct 31, 2023

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Sep 21, 2023 •
edited
Loading

Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups.

Handle bad OG names by using the new format, keep good OG names as-is.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Sep 21, 2023
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-14698, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

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:

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.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 21, 2023
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 21, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 21, 2023
@tmshort tmshort changed the base branch from master to release-4.14 September 21, 2023 18:52
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-14698, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set
  • expected Jira Issue OCPBUGS-14698 to depend on a bug targeting a version in 4.15.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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.

In response to this:

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.

@tmshort
Copy link
Contributor Author

tmshort commented Sep 26, 2023

/jira cherrypick OCPBUGS-14698

@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-14698 has been cloned as Jira Issue OCPBUGS-19789. Will retitle bug to link to clone.
/retitle OCPBUGS-19789: OCPBUGS-14698: Prototype

In response to this:

/jira cherrypick OCPBUGS-14698

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.

@openshift-ci openshift-ci bot changed the title OCPBUGS-14698: Prototype OCPBUGS-19789: OCPBUGS-14698: Prototype Sep 26, 2023
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-19789, which is invalid:

  • expected dependent Jira Issue OCPBUGS-14698 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-14698 to target a version in 4.15.0, but no target version was set

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:

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.

@tmshort tmshort changed the title OCPBUGS-19789: OCPBUGS-14698: Prototype OCPBUGS-19789: Prototype Sep 26, 2023
@tmshort tmshort changed the title OCPBUGS-19789: Prototype OCPBUGS-19789: Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups Sep 26, 2023
@tmshort tmshort marked this pull request as ready for review September 26, 2023 14:53
@openshift-ci-robot 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 Sep 26, 2023
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-19789, 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.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-14698 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-14698 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 @jianzhangbjz

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

In response to this:

Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups.

Handle bad OG names by using the new format, keep good OG names as-is.

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.

@openshift-ci openshift-ci bot requested a review from jianzhangbjz September 26, 2023 14:53
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 26, 2023
@tmshort tmshort force-pushed the OCPBUGS-14698 branch 2 times, most recently from 3f40f8b to 40c2ae0 Compare September 26, 2023 18:33
@tmshort
Copy link
Contributor Author

tmshort commented Sep 27, 2023

/retest

@dinhxuanvu
Copy link
Member

@tmshort The unit-olm test looks perma-failed to me based on the test runs history. You may want to run it locally to see what the deal is.

@tmshort
Copy link
Contributor Author

tmshort commented Sep 27, 2023

@tmshort The unit-olm test looks perma-failed to me based on the test runs history. You may want to run it locally to see what the deal is.

I've never been able to run the unit-tests locally... (machine config)

@dinhxuanvu
Copy link
Member

@tmshort The unit-olm test looks perma-failed to me based on the test runs history. You may want to run it locally to see what the deal is.

I've never been able to run the unit-tests locally... (machine config)

Yah. I know it's a bit tricky to run tests on this downstream repo. You will need to get a OCP cluster and supply the config into some test commands in Makefile. So it requires some tinkering. I assume you didn't encounter this issue on upstream?

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2023
@tmshort
Copy link
Contributor Author

tmshort commented Oct 11, 2023

@awgreene downstreaming finally happpend, so this needs a LGTM and BACKPORT-RISK-ASSESSED

@tmshort
Copy link
Contributor Author

tmshort commented Oct 11, 2023

/retest

bandrade
bandrade approved these changes Oct 11, 2023
View reviewed changes
Copy link
Contributor

@bandrade bandrade left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2023
awgreene
awgreene approved these changes Oct 11, 2023
View reviewed changes
Copy link
Contributor

@awgreene awgreene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing the requested changes @tmshort

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, bandrade, dinhxuanvu, tmshort

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:

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

@awgreene
Copy link
Contributor

We're gonna wait on this one until 4.14.0 is released as it has existed since OLM was introduced and isn't worth the risk of delaying 4.14.0 GA.

@tmshort tmshort changed the title OCPBUGS-19789: Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups OCPBUGS-19789: Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups [release-4.14] Oct 20, 2023
Per Goncalves da Silva and others added 3 commits October 31, 2023 10:17
@tmshort
OCPBUGS-19789: Rename ClusterRoles created by OperatorGroups
4efe86a 
When an OperatorGroup creates a ClusterRole, it's based directly on the
OG name with a suffix, this causes two issues:
1. same-named OGs in different namespaces overwrite each others CRs
2. there are some very important CRs that could be overwritten by OG

Tests added.

Signed-off-by: Per Goncalves da Silva <[email protected]>
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 306cd60d8f204ce80c065bade124ff4eb353151a
(cherry picked from commit 92c653a)
@tmshort
fixup! OCPBUGS-19789: Rename ClusterRoles created by OperatorGroups
ec5a8a1 
Add 4.14-specific fix: Keep old name if still ok

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 20fbc301102f7553496c4be7d01b6e519c811179
(cherry picked from commit 8bc1bf8)
@tmshort
Fix Rename ClusterRoles created by OperatorGroups issues.
636c784 
Remove unused function.
Remove possibly verbose log statement.

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: fa51d6f651791a0f6eb3e288140f5e495d4138ff
(cherry picked from commit 72056f7)
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2023
@awgreene
Copy link
Contributor

/retest
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 31, 2023
@tmshort
Copy link
Contributor Author

tmshort commented Oct 31, 2023

/retest unit-olm
/retest e2e-upgrade

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 31, 2023

@tmshort: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test e2e-gcp-console-olm
  • /test e2e-gcp-olm
  • /test e2e-gcp-ovn
  • /test e2e-upgrade
  • /test images
  • /test unit-api
  • /test unit-olm
  • /test unit-psm
  • /test unit-registry
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-gcp-olm-flaky

Use /test all to run all jobs.

In response to this:

/retest unit-olm
/retest e2e-upgrade

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.

@tmshort
Copy link
Contributor Author

tmshort commented Oct 31, 2023

/test unit-olm
/test e2e-upgrade

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 31, 2023

@tmshort: 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.

dinhxuanvu
dinhxuanvu reviewed Oct 31, 2023
View reviewed changes
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2023
@openshift-ci openshift-ci bot merged commit fca14ec into openshift:release-4.14 Oct 31, 2023
@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-19789: All pull requests linked via external trackers have merged:

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

In response to this:

Backport OCPBUGS-14698: Rename ClusterRoles created by OperatorGroups.

Handle bad OG names by using the new format, keep good OG names as-is.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dinhxuanvu dinhxuanvu dinhxuanvu approved these changes

@bandrade bandrade bandrade approved these changes

@awgreene awgreene awgreene approved these changes

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

@perdasilva perdasilva Awaiting requested review from perdasilva

Assignees

@bandrade bandrade

@awgreene awgreene

@dinhxuanvu dinhxuanvu

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@tmshort @openshift-ci-robot @dinhxuanvu @bandrade @awgreene @jianzhangbjz @emmajiafan @kuiwang02 @Xia-Zhao-rh @KeenonLee