Skip to content

Conversation

@perdasilva
Copy link
Contributor

No description provided.

joelanford and others added 2 commits January 16, 2025 11:28
…n handler (#3483)

* switch queue informer to use types.NamespacedName; relocate deletion handler

Signed-off-by: Joe Lanford <[email protected]>

* Add error message to object count assertion failure

Signed-off-by: Per Goncalves da Silva <[email protected]>

---------

Signed-off-by: Joe Lanford <[email protected]>
Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: edb751b9718ffe29e8462ce17867ec3db3b349ff
Signed-off-by: Per Goncalves da Silva <[email protected]>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2025
@perdasilva
Copy link
Contributor Author

/jira refresh

@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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 16, 2025
@openshift-ci-robot
Copy link

@perdasilva: This pull request references Jira Issue OCPBUGS-48486, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

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

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.

@openshift-ci openshift-ci bot requested a review from kuiwang02 January 16, 2025 11:18
@perdasilva
Copy link
Contributor Author

/retest

4 similar comments
@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

/retest

@kuiwang02
Copy link
Contributor

@perdasilva Hi, what is the different between this PR and #929 ?
Thanks

@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor Author

perdasilva commented Jan 17, 2025

@perdasilva Hi, what is the different between this PR and #929 ? Thanks

@kuiwang02 there shouldn't be any differences. The reason I'm not using that one is that I just side-loaded the upstream PR (which hadn't merged yet) for your testing. After you gave your approval, we felt comfortable merging upstream, and this is us downstreaming it now =D I think it would be ok to do do a lite verification. Assuming CI goes through =S

btw - thanks again for doing that for us! it really made us feel more comfortable merging it!!

@perdasilva
Copy link
Contributor Author

/retest

@tmshort
Copy link
Contributor

tmshort commented Jan 17, 2025

@perdasilva the upstream PR operator-framework/operator-lifecycle-manager#3483 has been merged.
PR #937 has upstream PR3483 as the first commit, but it is failing.
Why are we not able to use #937 as-is (via the bumper)? Why do we have to modify the vendor directory?

I'm concerned this will bite us in the future.

@joelanford since this is a downstream of your PR, can you verify it looks correct?

@tmshort
Copy link
Contributor

tmshort commented Jan 17, 2025

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2025
@perdasilva
Copy link
Contributor Author

perdasilva commented Jan 20, 2025

@tmshort I mentioned it in the auto sync PR. We cannot bring it down because it requires downstream changes. The fix for the concurrent namespace resolution makes changes to the workqueues. We have some downstream only reconcilers. Merging this will clear up the auto sync.

Here's the downstream only commit. It would also be possible to just cherry pick this commit into another downsync. But, I really want to get this down and start on the backporting to free up SRE.

@perdasilva
Copy link
Contributor Author

/cherry-pick release-4.17

@openshift-cherrypick-robot

@perdasilva: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.17

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.

@tmshort
Copy link
Contributor

tmshort commented Jan 20, 2025

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 20, 2025
Copy link
Contributor

@tmshort tmshort left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, 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

@perdasilva
Copy link
Contributor Author

/retest

@oceanc80
Copy link
Contributor

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 20, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2025

@perdasilva: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 728cbe2 into openshift:master Jan 20, 2025
14 checks passed
@openshift-ci-robot
Copy link

@perdasilva: Jira Issue OCPBUGS-48486: All pull requests linked via external trackers have merged:

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

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-cherrypick-robot

@perdasilva: #936 failed to apply on top of branch "release-4.17":

Applying: bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
M	staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
M	staging/operator-lifecycle-manager/pkg/package-server/server/server.go
M	staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/package-server/server/server.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/package-server/server/server.go
Removing staging/operator-lifecycle-manager/pkg/lib/queueinformer/config_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.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 bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)

In response to this:

/cherry-pick release-4.17

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.

@perdasilva
Copy link
Contributor Author

/cherry-pick release-4.18

@openshift-cherrypick-robot

@perdasilva: new pull request created: #945

In response to this:

/cherry-pick release-4.18

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.19.0-202501202140.p0.g728cbe2.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.19.0-202501202140.p0.g728cbe2.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-operator-framework-tools
This PR has been included in build ose-operator-framework-tools-container-v4.19.0-202501202140.p0.g728cbe2.assembly.stream.el9.
All builds following this will include this PR.

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

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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

Development

Successfully merging this pull request may close these issues.

8 participants