OCPBUGS-37982: Synchronize From Upstream Repositories #1029

openshift-bot · 2025-06-19T00:04:00Z

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

Date	Commit	Author	Message
2025-06-18 15:06:28	operator-framework/operator-lifecycle-manager@d055f28	Todd Short	🐛 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597)
2025-06-24 10:09:04	operator-framework/operator-lifecycle-manager@12bfcd8	dependabot[bot]	🌱 Bump github.com/prometheus/common from 0.64.0 to 0.65.0 (#3604)
2025-06-24 12:51:10	operator-framework/operator-lifecycle-manager@3c2163e	Camila Macedo	Upgrade bingo deps (#3601)

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-ci-robot · 2025-06-19T00:04:04Z

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

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-06-18 15:06:28 operator-framework/operator-lifecycle-manager@d055f28 Todd Short 🐛 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597)

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 · 2025-06-19T00:04:06Z

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

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-06-18 15:06:28 operator-framework/operator-lifecycle-manager@d055f28 Todd Short 🐛 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597)

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.

jianzhangbjz · 2025-06-19T07:12:03Z

/hold

tmshort · 2025-06-19T07:15:57Z

/retest-required

jianzhangbjz · 2025-06-19T08:50:16Z

/unhold

jianzhangbjz · 2025-06-19T08:52:04Z

Hold since OCPBUGS-37982

@kuiwang02 ^^
/hold

jianzhangbjz · 2025-06-19T11:44:21Z

Basic test pass, unhold it.
/label qe-approved
/unhold

openshift-ci-robot · 2025-06-19T12:26:11Z

/retest-required

Remaining retests: 0 against base HEAD d5a91ad and 2 for PR HEAD 190b690 in total

jianzhangbjz · 2025-06-23T12:02:29Z

/unhold

openshift-ci-robot · 2025-06-23T12:40:38Z

/retest-required

Remaining retests: 0 against base HEAD d5a91ad and 2 for PR HEAD 190b690 in total

tmshort · 2025-06-23T18:53:27Z

/retest-required

camilamacedo86 · 2025-06-23T19:25:10Z

/test e2e-gcp-olm

camilamacedo86 · 2025-06-23T19:25:14Z

/test e2e-gcp-olm

camilamacedo86 · 2025-06-23T20:43:27Z

/test e2e-gcp-olm

tmshort · 2025-06-23T23:44:38Z

/retest-required

jianzhangbjz · 2025-06-24T01:54:04Z

/unhold

camilamacedo86

/lgtm

openshift-ci · 2025-06-24T10:51:52Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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

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

camilamacedo86 · 2025-06-24T11:33:37Z

/test e2e-gcp-olm

openshift-ci-robot · 2025-06-24T15:40:52Z

/retest-required

Remaining retests: 0 against base HEAD 79b5612 and 2 for PR HEAD 0331d72 in total

openshift-ci-robot · 2025-06-24T18:16:09Z

/retest-required

Remaining retests: 0 against base HEAD 79b5612 and 2 for PR HEAD 0331d72 in total

openshift-ci-robot · 2025-06-24T23:46:00Z

/retest-required

Remaining retests: 0 against base HEAD 79b5612 and 2 for PR HEAD 0331d72 in total

…(#3597) * (bugfix): reduce frequency of update requests for CSVs by adding annotations to copied CSVs that are populated with hashes of the non-status fields and the status fields. This seems to be how this was intended to work, but was not actually working this way because the annotations never actually existed on the copied CSV. This resulted in a hot loop of update requests being made on all copied CSVs. Signed-off-by: everettraven <[email protected]> * update unit tests Signed-off-by: everettraven <[email protected]> * updates to test so far Signed-off-by: everettraven <[email protected]> * Small changes Signed-off-by: Brett Tofel <[email protected]> * Add metadata drift guard to copyToNamespace Since we switched to a PartialObjectMetadata cache to save memory, we lost visibility into copied CSV spec and status fields, and the reintroduced nonStatusCopyHash/statusCopyHash annotations only partially solved the problem. Manual edits to a copied CSV could still go undetected, causing drift without reconciliation. This commit adds two new annotations: olm.operatorframework.io/observedGeneration and olm.operatorframework.io/observedResourceVersion. It implements a mechanism to guard agains metadata drift at the top of the existing-copy path in copyToNamespace. If a stored observedGeneration or observedResourceVersion no longer matches the live object, the operator now: • Updates the spec and hash annotations • Updates the status subresource • Records the new generation and resourceVersion in the guard annotations Because the guard only fires when its annotations are already present, all existing unit tests pass unchanged. We preserve the memory benefits of the metadata‐only informer, avoid extra GETs, and eliminate unnecessary API churn. Future work may explore a WithTransform informer to regain full object visibility with minimal memory impact. Signed-off-by: Brett Tofel <[email protected]> * Tests for metadata guard Verifies that exactly three updates (spec, status, guard) are issued when the observedGeneration doesn’t match. Signed-off-by: Brett Tofel <[email protected]> * Persist observed annotations on all status updates Signed-off-by: Brett Tofel <[email protected]> * GCI the file Signed-off-by: Brett Tofel <[email protected]> * Use TransformFunc Unit tests not updated Signed-off-by: Todd Short <[email protected]> * Update operatorgroup tests to compile Signed-off-by: Todd Short <[email protected]> * Restore operatorgroup_test from master Remove metadatalister Signed-off-by: Todd Short <[email protected]> * Remove more PartialObjectMetadata Signed-off-by: Todd Short <[email protected]> * Remove hashes from operator_test Signed-off-by: Todd Short <[email protected]> * Fix error messages for static-analysis Signed-off-by: Todd Short <[email protected]> * Update test annotations and test client Signed-off-by: Todd Short <[email protected]> * Rename pruning to listerwatcher Signed-off-by: Todd Short <[email protected]> * Set resync to 6h Signed-off-by: Todd Short <[email protected]> * Add CSV copy revert syncer Signed-off-by: Todd Short <[email protected]> * Log tweaks Signed-off-by: Todd Short <[email protected]> * Consolidate revert and gc syncers Signed-off-by: Todd Short <[email protected]> * Add logging and reduce the amount of metadata in the TransformFunc Signed-off-by: Todd Short <[email protected]> * Handle the copy CSV revert via a requeue of the primary CSV Signed-off-by: Todd Short <[email protected]> * Revert "Set resync to 6h" This reverts commit 855f940a2199bd4071c51f14ef44728550bf13cf. Signed-off-by: Todd Short <[email protected]> * Add delete handler for copied csv Signed-off-by: Todd Short <[email protected]> * Revert whitespace change Signed-off-by: Todd Short <[email protected]> * Rename function, fix comment Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: everettraven <[email protected]> Signed-off-by: Brett Tofel <[email protected]> Signed-off-by: Todd Short <[email protected]> Co-authored-by: everettraven <[email protected]> Co-authored-by: Brett Tofel <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: d055f28750cf62f966f566d36990fff5285c7a71

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.64.0 to 0.65.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.64.0...v0.65.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-version: 0.65.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 12bfcd8e8457305316f9983b20be97e23890a3a7

Upstream-repository: operator-lifecycle-manager Upstream-commit: 3c2163e1e4510ee878c47c1b3c0da36cc5f6ad3c

openshift-ci-robot · 2025-06-25T00:04:10Z

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

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-06-18 15:06:28 operator-framework/operator-lifecycle-manager@d055f28 Todd Short 🐛 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597)

2025-06-24 10:09:04 operator-framework/operator-lifecycle-manager@12bfcd8 dependabot[bot] 🌱 Bump github.com/prometheus/common from 0.64.0 to 0.65.0 (#3604)

2025-06-24 12:51:10 operator-framework/operator-lifecycle-manager@3c2163e Camila Macedo Upgrade bingo deps (#3601)

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.

jianzhangbjz · 2025-06-25T03:22:15Z

QE pre-merged test pass, https://issues.redhat.com/browse/OCPBUGS-37982 @kuiwang02 correct me if I'm wrong, thanks!
/label qe-approved
/lgtm

jianzhangbjz · 2025-06-25T03:22:23Z

/unhold

openshift-ci-robot · 2025-06-25T03:49:41Z

/retest-required

Remaining retests: 0 against base HEAD 79b5612 and 2 for PR HEAD 25a4959 in total

camilamacedo86 · 2025-06-25T06:39:42Z

See the discussion about the tests: https://redhat-internal.slack.com/archives/C06KP34REFJ/p1750780697758699
It seems that the test is not working well against the new OCP version.

openshift-ci · 2025-06-25T06:46:51Z

@openshift-bot: 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-bot · 2025-06-25T09:38:56Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2025-06-25T09:38:56Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2025-06-25T09:44:58Z

[ART PR BUILD NOTIFIER]

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

tmshort · 2025-06-30T17:17:36Z

/retitle OCPBUGS-37982: Synchronize From Upstream Repositories

openshift-ci-robot · 2025-06-30T17:17:47Z

@openshift-bot: Jira Issue OCPBUGS-37982: All pull requests linked via external trackers have merged:

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

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-06-18 15:06:28 operator-framework/operator-lifecycle-manager@d055f28 Todd Short 🐛 OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597)

2025-06-24 10:09:04 operator-framework/operator-lifecycle-manager@12bfcd8 dependabot[bot] 🌱 Bump github.com/prometheus/common from 0.64.0 to 0.65.0 (#3604)

2025-06-24 12:51:10 operator-framework/operator-lifecycle-manager@3c2163e Camila Macedo Upgrade bingo deps (#3601)

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-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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 Jun 19, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 19, 2025

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

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

openshift-ci bot added qe-approved Signifies that QE has signed off on this PR and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 19, 2025

openshift-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 20, 2025

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

openshift-bot force-pushed the synchronize-upstream branch from 190b690 to 0331d72 Compare June 24, 2025 00:02

openshift-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 24, 2025

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2025

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

camilamacedo86 approved these changes Jun 24, 2025

View reviewed changes

openshift-ci bot assigned camilamacedo86 Jun 24, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2025

tmshort and others added 3 commits June 25, 2025 00:03

Upgrade bingo deps (#3601)

25a4959

Upstream-repository: operator-lifecycle-manager Upstream-commit: 3c2163e1e4510ee878c47c1b3c0da36cc5f6ad3c

openshift-bot force-pushed the synchronize-upstream branch from 0331d72 to 25a4959 Compare June 25, 2025 00:04

openshift-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 25, 2025

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2025

openshift-ci bot assigned jianzhangbjz Jun 25, 2025

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 25, 2025

openshift-merge-bot bot merged commit 3b01b7b into openshift:main Jun 25, 2025
15 checks passed

openshift-ci bot changed the title ~~NO-ISSUE: Synchronize From Upstream Repositories~~ OCPBUGS-37982: Synchronize From Upstream Repositories Jun 30, 2025

OCPBUGS-37982: Synchronize From Upstream Repositories #1029

OCPBUGS-37982: Synchronize From Upstream Repositories #1029

Uh oh!

Conversation

openshift-bot commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

openshift-ci bot commented Jun 19, 2025

Uh oh!

jianzhangbjz commented Jun 19, 2025

Uh oh!

tmshort commented Jun 19, 2025

Uh oh!

jianzhangbjz commented Jun 19, 2025

Uh oh!

jianzhangbjz commented Jun 19, 2025

Uh oh!

jianzhangbjz commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

jianzhangbjz commented Jun 23, 2025

Uh oh!

openshift-ci-robot commented Jun 23, 2025

Uh oh!

tmshort commented Jun 23, 2025

Uh oh!

camilamacedo86 commented Jun 23, 2025

/test e2e-gcp-olm

Uh oh!

camilamacedo86 commented Jun 23, 2025

Uh oh!

camilamacedo86 commented Jun 23, 2025

Uh oh!

tmshort commented Jun 23, 2025

Uh oh!

jianzhangbjz commented Jun 24, 2025

Uh oh!

camilamacedo86 left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jun 24, 2025

Uh oh!

camilamacedo86 commented Jun 24, 2025

Uh oh!

openshift-ci-robot commented Jun 24, 2025

Uh oh!

openshift-ci-robot commented Jun 24, 2025

Uh oh!

openshift-ci-robot commented Jun 24, 2025

Uh oh!

openshift-ci-robot commented Jun 25, 2025

Uh oh!

jianzhangbjz commented Jun 25, 2025

Uh oh!

jianzhangbjz commented Jun 25, 2025

Uh oh!

openshift-ci-robot commented Jun 25, 2025

Uh oh!

camilamacedo86 commented Jun 25, 2025

Uh oh!

openshift-ci bot commented Jun 25, 2025

Uh oh!

Uh oh!

openshift-bot commented Jun 25, 2025

Uh oh!

openshift-bot commented Jun 25, 2025

Uh oh!

openshift-bot commented Jun 25, 2025

Uh oh!

tmshort commented Jun 30, 2025

Uh oh!

openshift-ci-robot commented Jun 30, 2025

Uh oh!

Uh oh!

openshift-bot commented Jun 19, 2025 •

edited

Loading