Skip to content

NO-ISSUE: Synchronize From Upstream Repositories#937

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
openshift-bot:synchronize-upstream
Jan 20, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories#937
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
openshift-bot:synchronize-upstream

Conversation

@openshift-bot
Copy link
Copy Markdown
Contributor

@openshift-bot openshift-bot commented Jan 17, 2025 •
edited
Loading

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-01-16 15:03:31 operator-framework/operator-lifecycle-manager@1274d54 Joe Lanford 🐛 use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
2025-01-16 15:57:50 operator-framework/operator-lifecycle-manager@4043bab Per Goncalves da Silva Add more logging around catalog source sync (#3414)
2025-01-17 08:50:35 operator-framework/operator-lifecycle-manager@451e775 Joe Lanford sort lists of identifiers and conflict messages to reduce SAT solver non-determinism (#3491)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

@openshift-bot openshift-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Jan 17, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 17, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 17, 2025

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-01-15 14:03:43 operator-framework/operator-lifecycle-manager@edb751b Joe Lanford 🐛 Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)
2025-01-16 15:03:31 operator-framework/operator-lifecycle-manager@1274d54 Joe Lanford 🐛 use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
2025-01-16 15:57:50 operator-framework/operator-lifecycle-manager@4043bab Per Goncalves da Silva Add more logging around catalog source sync (#3414)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 17, 2025

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-01-15 14:03:43 operator-framework/operator-lifecycle-manager@edb751b Joe Lanford 🐛 Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)
2025-01-16 15:03:31 operator-framework/operator-lifecycle-manager@1274d54 Joe Lanford 🐛 use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
2025-01-16 15:57:50 operator-framework/operator-lifecycle-manager@4043bab Per Goncalves da Silva Add more logging around catalog source sync (#3414)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

The pull request process is described here

Details 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

1 similar comment
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

The pull request process is described here

Details 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
Copy Markdown
Contributor

perdasilva commented Jan 17, 2025

#936 needs to get merged first - it has the necessary downstream fixes to get the sync to work again

@tmshort tmshort mentioned this pull request Jan 17, 2025
Merged
@tmshort
Copy link
Copy Markdown
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
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2025
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2025
@oceanc80
Copy link
Copy Markdown
Contributor

oceanc80 commented Jan 20, 2025

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 20, 2025
joelanford and others added 3 commits January 20, 2025 19:42
@joelanford
🐛 use operator cache provider for deprecation updates to limit calls …
3e6b5f8 
…to GRPC server (#3490)

* add log and metric to instrument count of catalog source snapshots

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

* use operator cache provider for deprecation updates to limit calls to GRPC server

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

---------

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1274d54d885649786733d0b3fe499e9670f3310d
@perdasilva
Add more logging around catalog source sync (#3414)
66df060 
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4043bab07a49d07ce15e5e9aa82dd32845ca4cbf
@joelanford
sort lists of identifiers and conflict messages to reduce SAT solver …
a6ec135 
…non-determinism (#3491)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 451e775ea03eb9280399ba0abaf19bd237df167c
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 20, 2025
@oceanc80
Copy link
Copy Markdown
Contributor

oceanc80 commented Jan 20, 2025

/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
@tmshort
Copy link
Copy Markdown
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
@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Jan 20, 2025

/lgtm

@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
Copy Markdown
Contributor

openshift-ci Bot commented Jan 20, 2025

@openshift-bot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm-flaky a6ec135 link false /test e2e-gcp-olm-flaky

Full PR test history. Your PR dashboard.

Details

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 bdee5d9 into openshift:master Jan 20, 2025
@openshift-bot
Copy link
Copy Markdown
Contributor Author

openshift-bot commented Jan 21, 2025

[ART PR BUILD NOTIFIER]

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

@openshift-bot
Copy link
Copy Markdown
Contributor Author

openshift-bot commented Jan 21, 2025

[ART PR BUILD NOTIFIER]

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

@openshift-bot
Copy link
Copy Markdown
Contributor Author

openshift-bot commented Jan 21, 2025

[ART PR BUILD NOTIFIER]

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

This was referenced Jan 21, 2025
Merged
Closed
Closed
Closed
This was referenced Jan 22, 2025
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@tmshort tmshort

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

7 participants

@openshift-bot @openshift-ci-robot @perdasilva @tmshort @oceanc80 @openshift-merge-robot @joelanford