Skip to content

NO-ISSUE: Synchronize From Upstream Repositories - #561

Merged
openshift-merge-bot[bot] merged 39 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream
Nov 20, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories#561
openshift-merge-bot[bot] merged 39 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream

Conversation

@openshift-bot

@openshift-botopenshift-bot commented Nov 18, 2025

Copy link
Copy Markdown

The downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-19 20:37:50operator-framework/operator-controller@1355ff7Jordan Keisteroverride local pull policy with permissive policy (#2339)
2025-11-19 20:20:57operator-framework/operator-controller@12ac242Camila Macedofix: rename owner label and clarify variable naming (#2349)
2025-11-19 14:42:01operator-framework/operator-controller@03eb884Todd ShortUse local cache to check kind version (#2346)
2025-11-18 19:28:40operator-framework/operator-controller@f3569d5Todd ShortFix Boxcutter manifest ordering inconsistency (#2329)
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-11-19 16:37:18openshift/operator-framework-operator-controller@38b65b4Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote

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

camilamacedo86and others added 11 commits November 17, 2025 14:20
* Upgrade golangci-lint from v2.1.6 to v2.6.2
**Steps Executed**
- with go 1.24.6
- bingo get golangci-lint@none
- bingo get github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
* (fix): Linter issue : testifylint error-is-as: use require.ErrorIs or require.ErrorAs depending on the case
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
ClusterExtension configuration is now validated using JSONSchema. Configuration
errors (typos, missing required fields, wrong types) are caught
immediately with clear error messages instead of failing during installation.
Assisted-by: Cursor
Bumps [github.com/google/renameio/v2](https://github.com/google/renameio) from 2.0.0 to 2.0.1.
- [Commits](google/renameio@v2.0.0...v2.0.1)
---
updated-dependencies:
- dependency-name: github.com/google/renameio/v2
dependency-version: 2.0.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Detailed reconcile and teardown reports are now only logged when
debug mode is enabled, preventing excessive log output.
This restores the last-applied-config annotation in the cache, as its
absense can cause issues with clients when we update our finalizers.
This increases memory utilization until we can solve the finalizer issue.
Signed-off-by: Todd Short <tshort@redhat.com>
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.67.2 to 0.67.3.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/CHANGELOG.md)
- [Commits](prometheus/common@v0.67.2...v0.67.3)
---
updated-dependencies:
- dependency-name: github.com/prometheus/common
dependency-version: 0.67.3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [click](https://github.com/pallets/click) from 8.3.0 to 8.3.1.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](pallets/click@8.3.0...8.3.1)
---
updated-dependencies:
- dependency-name: click
dependency-version: 8.3.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…it chains (#2315)
Instead of tracking revision history through Spec.Previous fields, we now
find related revisions using labels and the controller-runtime cache. This
is more efficient and works better with controller-runtime's caching layer.
To support this change, the Helm-to-Boxcutter migration now sets
ownerReferences on migrated revisions, ensuring they work identically
to newly created revisions.
Assisted-by: Cursor
Add `/test-profile` slash command to enable interactive profiling workflow
through Claude Code interface with the Go-based test profiling tools.
The command provides access to:
- start/stop: Background profiling daemon workflow
- run: Automated test execution with profiling
- analyze: Generate analysis reports from collected profiles
- compare: Compare two test runs side-by-side
- collect: One-time profile snapshots
Documentation includes configuration, output structure, and implementation
steps for the Go-based CLI tool located in hack/tools/test-profiling/.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Signed-off-by: Todd Short <tshort@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
The latest bingo files were generated with bingo v0.10.0, which requires
golang 1.24.9, which we don't support.
Downgrade the output files via bingo v0.9.0
Add test to ensure correct version of bingo is used.
Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-botopenshift-bot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. kind/sync labels Nov 18, 2025
@openshift-ci-robotopenshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 18, 2025
@openshift-ci-robot

Copy link
Copy Markdown

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

Details

In response to this:

The downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE

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-botopenshift-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 Nov 18, 2025
@openshift-ci

Copy link
Copy Markdown
Contributor

@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 downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE

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

[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

[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

Issue:
Manifest ordering inconsistency: CRDs from Helm release manifest and
bundle manifest appeared in different orders, causing PhaseSort to
produce different phase structures even though they contained the same
objects.
Solution:
Added deterministic sorting in PhaseSort (phase.go):
- Sort objects within each phase by Group, Version, Kind, Namespace, Name
- Ensures consistent phase structure regardless of input order
- Critical for comparing revisions from different sources
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Signed-off-by: Todd Short <tshort@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
@camilamacedo86

Copy link
Copy Markdown
Contributor

/retitle OCPBUGS-62964:Synchronize From Upstream Repositories

@openshift-ciopenshift-ciBot changed the title NO-ISSUE: Synchronize From Upstream RepositoriesOCPBUGS-62964:Synchronize From Upstream RepositoriesNov 18, 2025
@openshift-ci-robotopenshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 18, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-bot: This pull request references Jira Issue OCPBUGS-62964, which is invalid:

  • expected the bug to target the "4.21.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.

Details

In response to this:

The downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE

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.

@camilamacedo86

Copy link
Copy Markdown
Contributor

/retitle OCPBUGS-63612,OCPBUGS-63611,OCPBUGS-62964:Synchronize From Upstream Repositories

@openshift-ciopenshift-ciBot changed the title OCPBUGS-62964:Synchronize From Upstream RepositoriesOCPBUGS-63612,OCPBUGS-63611,OCPBUGS-62964:Synchronize From Upstream RepositoriesNov 18, 2025
@openshift-ci-robotopenshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Nov 18, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-bot: This pull request references Jira Issue OCPBUGS-63612, which is invalid:

  • expected the bug to target the "4.21.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.

This pull request references Jira Issue OCPBUGS-63611, which is invalid:

  • expected the bug to target the "4.21.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.

This pull request references Jira Issue OCPBUGS-62964, which is valid.

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

Requesting review from QA contact:
/cc @Xia-Zhao-rh

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

Details

In response to this:

The downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE

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.

kuiwang02and others added 18 commits November 20, 2025 00:06
Signed-off-by: Todd Short <todd.short@me.com>
…uess and waiting for k8s cleanups
Co-Author: kuiwang@redhat.com
… format
Fix k8s.io/kubernetes replace version from v1.30.1-0... to v0.0.0-... format to resolve
bumper tool verification failures. Add hack/ocp-replace.sh script to manage OCP fork
replaces properly.
Assisted-by: Cursor
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
@openshift-botopenshift-bot changed the title OCPBUGS-62964: Synchronize From Upstream RepositoriesNO-ISSUE: Synchronize From Upstream RepositoriesNov 20, 2025
@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2025
@openshift-ci-robotopenshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 20, 2025
@openshift-ci-robot

Copy link
Copy Markdown

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

Details

In response to this:

The downstream repository has been updated with the following following upstream commits:

DateCommitAuthorMessage
2025-11-19 20:37:50operator-framework/operator-controller@1355ff7Jordan Keisteroverride local pull policy with permissive policy (#2339)
2025-11-19 20:20:57operator-framework/operator-controller@12ac242Camila Macedofix: rename owner label and clarify variable naming (#2349)
2025-11-19 14:42:01operator-framework/operator-controller@03eb884Todd ShortUse local cache to check kind version (#2346)
2025-11-18 19:28:40operator-framework/operator-controller@f3569d5Todd ShortFix Boxcutter manifest ordering inconsistency (#2329)
2025-11-18 17:23:20operator-framework/operator-controller@6ef62deTodd ShortDowngrade bingo output files to v0.9.0 (#2343)
2025-11-18 17:17:36operator-framework/operator-controller@be247a9Todd ShortAdd /test-profile slash command for Claude Code integration (#2309)
2025-11-18 16:37:27operator-framework/operator-controller@472e8a2Camila Macedo(chore): Use label-based cache for revision lookups instead of explicit chains (#2315)
2025-11-18 15:21:18operator-framework/operator-controller@fc65e52dependabot[bot]🌱 Bump click from 8.3.0 to 8.3.1 (#2342)
2025-11-18 14:28:08operator-framework/operator-controller@697f392dependabot[bot]🌱 Bump github.com/prometheus/common from 0.67.2 to 0.67.3 (#2341)
2025-11-17 18:21:30operator-framework/operator-controller@39cbdbeTodd ShortRestore last-applied-config annotation in cache (#2338)
2025-11-17 15:49:59operator-framework/operator-controller@1eb9b70Camila MacedoReduce log verbosity by moving BoxCutter reports to debug mode (#2335)
2025-11-17 15:33:23operator-framework/operator-controller@cbdb84cdependabot[bot]🌱 Bump github.com/google/renameio/v2 from 2.0.0 to 2.0.1 (#2337)
2025-11-17 15:05:09operator-framework/operator-controller@15b4904Camila Macedo(chore): Add JSONSchema validation for bundle configuration (#2316)
2025-11-17 14:22:52operator-framework/operator-controller@bf7e39fPer Goncalves da SilvaAdd enum validation annotation to CollisionProtection (#2334)
2025-11-17 14:20:06operator-framework/operator-controller@e20c9bcCamila Macedo🌱 Upgrade golangci-lint from v2.1.6 to v2.6.2 (#2336)

The vendor/ directory has been updated and the following commits were carried:

DateCommitAuthorMessage
2025-11-14 08:43:47openshift/operator-framework-operator-controller@a6f7485dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-11-14 08:43:49openshift/operator-framework-operator-controller@06d5349Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-14 08:43:49openshift/operator-framework-operator-controller@e596d63Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-14 08:43:50openshift/operator-framework-operator-controller@a8277f6Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-14 08:43:50openshift/operator-framework-operator-controller@dbcc986Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-14 08:43:51openshift/operator-framework-operator-controller@b2b0722Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-11-14 08:43:52openshift/operator-framework-operator-controller@90c4f7bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-14 08:43:52openshift/operator-framework-operator-controller@ae03a5eCamila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-14 08:43:53openshift/operator-framework-operator-controller@c5ed0dfTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-14 08:43:54openshift/operator-framework-operator-controller@04612f1Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-14 08:43:54openshift/operator-framework-operator-controller@16a80d7Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-14 08:43:55openshift/operator-framework-operator-controller@08ea1c5Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-14 08:43:55openshift/operator-framework-operator-controller@e7a54cfCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-14 08:43:56openshift/operator-framework-operator-controller@456b2cbKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-14 08:43:57openshift/operator-framework-operator-controller@e634b3bCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-14 08:43:58openshift/operator-framework-operator-controller@a541023Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-14 08:43:59openshift/operator-framework-operator-controller@86790b0Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 08:44:00openshift/operator-framework-operator-controller@6f5a157Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-11-17 16:21:00openshift/operator-framework-operator-controller@63baa57Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-11-19 16:37:18openshift/operator-framework-operator-controller@38b65b4Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote

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-bot: all tests passed!

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.

@Xia-Zhao-rh

Copy link
Copy Markdown
Contributor

/verified by @Xia-Zhao-rh

@openshift-ci-robotopenshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 20, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@Xia-Zhao-rh: This PR has been marked as verified by @Xia-Zhao-rh.

Details

In response to this:

/verified by @Xia-Zhao-rh

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.

@camilamacedo86

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2025
@openshift-merge-bot
openshift-merge-botBot merged commit c310c42 into openshift:mainNov 20, 2025
11 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by an approver from all required OWNERS files.jira/valid-referenceIndicates that this PR references a valid Jira ticket of any type.kind/synclgtmIndicates that a PR is ready to be merged.tide/merge-method-mergeDenotes a PR that should use a standard merge by tide when it merges.verifiedSignifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@openshift-bot@openshift-ci-robot@camilamacedo86@jianzhangbjz@kuiwang02@Xia-Zhao-rh@tmshort@perdasilva@grokspawn@dtfranz