olm,catalog: only validate the resources we label #3165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Each controller can see (and, therefore, can label) a separate set of GVRs. When we start up, detecting if any OLM-related resource needs labelling means that one controller may start, detect a need for labelling a resource it cannot itself label, detect that it's labelled everything it can, and restart. If the other operator is stuck for whatever reason, this leads the first controller to enter CrashLoopBackOff and break OCP upgrade. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
stevekuznetsov
force-pushed
the
skuznets/fix-owners-and-labels
branch
from
d2f8939
to
3f66a69
Compare
stevekuznetsov
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@stevekuznetsov: This pull request references Jira Issue OCPBUGS-28744, which is invalid:
Comment 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 openshift-eng/jira-lifecycle-plugin repository. |
ncdc
changed the title
openshift-ci-robot
removed
the
jira/valid-reference
|
@stevekuznetsov: No Jira issue is referenced in the title of this pull request. 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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
removed
the
jira/invalid-bug
|
@stevekuznetsov I removed the downstream jira from the title of this upstream PR |
|
LGTM. Probably need to investigate e2e failures to see if they're flakes or due to this PR. @joelanford PTAL at the PR - thx |
stevekuznetsov
force-pushed
the
skuznets/fix-owners-and-labels
branch
2 times, most recently
from
6a49102
to
04231c1
Compare
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
stevekuznetsov
force-pushed
the
skuznets/fix-owners-and-labels
branch
from
04231c1
to
da9593a
Compare
|
Still LGTM. Joe? |
Can't grok how that could be our fault |
joelanford
reviewed
Feb 1, 2024
Comment on lines
+289
to
+291
| if ref.Kind == ownerRef.Kind && ref.Name == ownerRef.Name && ref.UID == ownerRef.UID { | ||
| return | ||
| } |
There was a problem hiding this comment.
Is there any chance that we call this function with the same object, but with different blockOwnerDeletion or isController values?
Curious if we find the owner ref, rather than leaving what's there untouched, we should update what's there?
There was a problem hiding this comment.
I don't believe the codebase does any of that today. Generally speaking I would not expect isController to be something that logically could change.
joelanford
approved these changes
Feb 1, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: joelanford, stevekuznetsov 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 |
openshift-ci
bot
added
the
approved
|
/retest |
Merged
via the queue into
operator-framework:master
with commit Feb 2, 2024
1e0324c
15 of 16 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
*: don't duplicate owner references
Signed-off-by: Steve Kuznetsov skuznets@redhat.com
olm,catalog: only validate the resources we label
Each controller can see (and, therefore, can label) a separate set of
GVRs. When we start up, detecting if any OLM-related resource needs
labelling means that one controller may start, detect a need for
labelling a resource it cannot itself label, detect that it's labelled
everything it can, and restart. If the other operator is stuck for
whatever reason, this leads the first controller to enter
CrashLoopBackOff and break OCP upgrade.
Signed-off-by: Steve Kuznetsov skuznets@redhat.com