Skip to content

Conversation

@openshift-bot
Copy link

@openshift-bot openshift-bot commented Nov 12, 2025

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

Date Commit Author Message
2025-11-13 20:36:35 operator-framework/operator-controller@c06f27f Todd Short Only include ClusterExtensionRevision CRD when Boxcutter enabled (#2331)
2025-11-13 14:27:32 operator-framework/operator-controller@35e38aa dependabot[bot] 🌱 Bump golang.org/x/tools from 0.38.0 to 0.39.0 (#2330)
2025-11-12 20:08:20 operator-framework/operator-controller@c95fc24 Daniel Franz 🌱 Revision manifest sanitization (#2319)
2025-11-12 16:20:58 operator-framework/operator-controller@be43e58 dependabot[bot] 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0 (#2325)
2025-11-12 16:09:51 operator-framework/operator-controller@596b821 dependabot[bot] 🌱 Bump pymdown-extensions from 10.16.1 to 10.17.1 (#2327)
2025-11-12 16:07:07 operator-framework/operator-controller@7b6be4d dependabot[bot] 🌱 Bump certifi from 2025.10.5 to 2025.11.12 (#2326)
2025-11-12 16:01:39 operator-framework/operator-controller@95281f7 dependabot[bot] 🌱 Bump helm.sh/helm/v3 from 3.19.1 to 3.19.2 (#2324)

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

Date Commit Author Message
2025-11-11 17:53:41 openshift/operator-framework-operator-controller@24b7bf5 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-11 17:53:42 openshift/operator-framework-operator-controller@ecc068f Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-11 17:53:43 openshift/operator-framework-operator-controller@4696f9d Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@0ef7823 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@585c904 Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@3f60915 Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@69e68c6 Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-11 17:53:46 openshift/operator-framework-operator-controller@41a7d65 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@02d96e6 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@2d7529e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@d4d89f1 Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@6a4290c Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@262f4fc Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@6e242b6 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-11 17:53:51 openshift/operator-framework-operator-controller@5055bad Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-11 17:53:52 openshift/operator-framework-operator-controller@fc15dd5 Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-11 18:37:21 openshift/operator-framework-operator-controller@0572202 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 10:14:02 openshift/operator-framework-operator-controller@e2f03af Kui Wang UPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases

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

dependabot bot and others added 5 commits November 12, 2025 16:01
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.19.1 to 3.19.2.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.19.1...v3.19.2)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-version: 3.19.2
  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 [certifi](https://github.com/certifi/python-certifi) from 2025.10.5 to 2025.11.12.
- [Commits](certifi/python-certifi@2025.10.05...2025.11.12)

---
updated-dependencies:
- dependency-name: certifi
  dependency-version: 2025.11.12
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.16.1 to 10.17.1.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.16.1...10.17.1)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: 10.17.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.29.0 to 0.30.0.
- [Commits](golang/mod@v0.29.0...v0.30.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-version: 0.30.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Removes read-only or otherwise ill-advised fields from the manifests applied by revisions.

Assisted-by: Gemini+Claude
Signed-off-by: Daniel Franz <dfranz@redhat.com>

* Cleanup, add logging

Signed-off-by: Daniel Franz <dfranz@redhat.com>

---------

Signed-off-by: Daniel Franz <dfranz@redhat.com>
@openshift-bot openshift-bot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. kind/sync approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 12, 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 Nov 12, 2025
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2025
@openshift-ci-robot
Copy link

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

In response to this:

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

Date Commit Author Message
2025-11-12 20:08:20 operator-framework/operator-controller@c95fc24 Daniel Franz 🌱 Revision manifest sanitization (#2319)
2025-11-12 16:20:58 operator-framework/operator-controller@be43e58 dependabot[bot] 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0 (#2325)
2025-11-12 16:09:51 operator-framework/operator-controller@596b821 dependabot[bot] 🌱 Bump pymdown-extensions from 10.16.1 to 10.17.1 (#2327)
2025-11-12 16:07:07 operator-framework/operator-controller@7b6be4d dependabot[bot] 🌱 Bump certifi from 2025.10.5 to 2025.11.12 (#2326)
2025-11-12 16:01:39 operator-framework/operator-controller@95281f7 dependabot[bot] 🌱 Bump helm.sh/helm/v3 from 3.19.1 to 3.19.2 (#2324)

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

Date Commit Author Message
2025-11-11 17:53:41 openshift/operator-framework-operator-controller@24b7bf5 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-11 17:53:42 openshift/operator-framework-operator-controller@ecc068f Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-11 17:53:43 openshift/operator-framework-operator-controller@4696f9d Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@0ef7823 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@585c904 Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@3f60915 Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@69e68c6 Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-11 17:53:46 openshift/operator-framework-operator-controller@41a7d65 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@02d96e6 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@2d7529e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@d4d89f1 Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@6a4290c Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@262f4fc Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@6e242b6 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-11 17:53:51 openshift/operator-framework-operator-controller@5055bad Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-11 17:53:52 openshift/operator-framework-operator-controller@fc15dd5 Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-11 18:37:21 openshift/operator-framework-operator-controller@0572202 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies

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
Contributor

openshift-ci bot commented Nov 12, 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.

In response to this:

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

Date Commit Author Message
2025-11-12 20:08:20 operator-framework/operator-controller@c95fc24 Daniel Franz 🌱 Revision manifest sanitization (#2319)
2025-11-12 16:20:58 operator-framework/operator-controller@be43e58 dependabot[bot] 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0 (#2325)
2025-11-12 16:09:51 operator-framework/operator-controller@596b821 dependabot[bot] 🌱 Bump pymdown-extensions from 10.16.1 to 10.17.1 (#2327)
2025-11-12 16:07:07 operator-framework/operator-controller@7b6be4d dependabot[bot] 🌱 Bump certifi from 2025.10.5 to 2025.11.12 (#2326)
2025-11-12 16:01:39 operator-framework/operator-controller@95281f7 dependabot[bot] 🌱 Bump helm.sh/helm/v3 from 3.19.1 to 3.19.2 (#2324)

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

Date Commit Author Message
2025-11-11 17:53:41 openshift/operator-framework-operator-controller@24b7bf5 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-11 17:53:42 openshift/operator-framework-operator-controller@ecc068f Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-11 17:53:43 openshift/operator-framework-operator-controller@4696f9d Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@0ef7823 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@585c904 Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@3f60915 Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@69e68c6 Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-11 17:53:46 openshift/operator-framework-operator-controller@41a7d65 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@02d96e6 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@2d7529e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@d4d89f1 Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@6a4290c Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@262f4fc Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@6e242b6 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-11 17:53:51 openshift/operator-framework-operator-controller@5055bad Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-11 17:53:52 openshift/operator-framework-operator-controller@fc15dd5 Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-11 18:37:21 openshift/operator-framework-operator-controller@0572202 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies

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
Contributor

openshift-ci bot commented Nov 12, 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

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
Contributor

openshift-ci bot commented Nov 12, 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

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

dependabot bot and others added 2 commits November 13, 2025 14:27
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.38.0 to 0.39.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.38.0...v0.39.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-version: 0.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add a check for the BoxcutterRuntime feature-gate before including the
ClusterExtensionRevision CRD into the manifest.

Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2025
@jianzhangbjz
Copy link
Contributor

/verified by pass

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

@jianzhangbjz: This PR has been marked as verified by pass.

In response to this:

/verified by pass

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.

@dtfranz
Copy link
Contributor

dtfranz commented Nov 14, 2025

/retitle OCPBUGS-64721: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-64721: Synchronize From Upstream Repositories Nov 14, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 14, 2025
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-64721, 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.

In response to this:

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

Date Commit Author Message
2025-11-13 20:36:35 operator-framework/operator-controller@c06f27f Todd Short Only include ClusterExtensionRevision CRD when Boxcutter enabled (#2331)
2025-11-13 14:27:32 operator-framework/operator-controller@35e38aa dependabot[bot] 🌱 Bump golang.org/x/tools from 0.38.0 to 0.39.0 (#2330)
2025-11-12 20:08:20 operator-framework/operator-controller@c95fc24 Daniel Franz 🌱 Revision manifest sanitization (#2319)
2025-11-12 16:20:58 operator-framework/operator-controller@be43e58 dependabot[bot] 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0 (#2325)
2025-11-12 16:09:51 operator-framework/operator-controller@596b821 dependabot[bot] 🌱 Bump pymdown-extensions from 10.16.1 to 10.17.1 (#2327)
2025-11-12 16:07:07 operator-framework/operator-controller@7b6be4d dependabot[bot] 🌱 Bump certifi from 2025.10.5 to 2025.11.12 (#2326)
2025-11-12 16:01:39 operator-framework/operator-controller@95281f7 dependabot[bot] 🌱 Bump helm.sh/helm/v3 from 3.19.1 to 3.19.2 (#2324)

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

Date Commit Author Message
2025-11-11 17:53:41 openshift/operator-framework-operator-controller@24b7bf5 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-11 17:53:42 openshift/operator-framework-operator-controller@ecc068f Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-11 17:53:43 openshift/operator-framework-operator-controller@4696f9d Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@0ef7823 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@585c904 Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@3f60915 Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@69e68c6 Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-11 17:53:46 openshift/operator-framework-operator-controller@41a7d65 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@02d96e6 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@2d7529e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@d4d89f1 Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@6a4290c Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@262f4fc Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@6e242b6 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-11 17:53:51 openshift/operator-framework-operator-controller@5055bad Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-11 17:53:52 openshift/operator-framework-operator-controller@fc15dd5 Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-11 18:37:21 openshift/operator-framework-operator-controller@0572202 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies

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 openshift-ci bot requested a review from Xia-Zhao-rh November 14, 2025 02:18
@jianzhangbjz
Copy link
Contributor

hold
/hold
/assign @Xia-Zhao-rh

@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 Nov 14, 2025
@Xia-Zhao-rh
Copy link

Xia-Zhao-rh commented Nov 14, 2025

/verified by @Xia-Zhao-rh

Detail https://issues.redhat.com/browse/OCPBUGS-64721

camilamacedo86 and others added 14 commits November 14, 2025 08:43
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
@openshift-bot openshift-bot changed the title OCPBUGS-64721: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Nov 14, 2025
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2025
@openshift-ci-robot openshift-ci-robot removed verified Signifies that the PR passed pre-merge verification criteria jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 14, 2025
@openshift-ci-robot
Copy link

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

In response to this:

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

Date Commit Author Message
2025-11-13 20:36:35 operator-framework/operator-controller@c06f27f Todd Short Only include ClusterExtensionRevision CRD when Boxcutter enabled (#2331)
2025-11-13 14:27:32 operator-framework/operator-controller@35e38aa dependabot[bot] 🌱 Bump golang.org/x/tools from 0.38.0 to 0.39.0 (#2330)
2025-11-12 20:08:20 operator-framework/operator-controller@c95fc24 Daniel Franz 🌱 Revision manifest sanitization (#2319)
2025-11-12 16:20:58 operator-framework/operator-controller@be43e58 dependabot[bot] 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0 (#2325)
2025-11-12 16:09:51 operator-framework/operator-controller@596b821 dependabot[bot] 🌱 Bump pymdown-extensions from 10.16.1 to 10.17.1 (#2327)
2025-11-12 16:07:07 operator-framework/operator-controller@7b6be4d dependabot[bot] 🌱 Bump certifi from 2025.10.5 to 2025.11.12 (#2326)
2025-11-12 16:01:39 operator-framework/operator-controller@95281f7 dependabot[bot] 🌱 Bump helm.sh/helm/v3 from 3.19.1 to 3.19.2 (#2324)

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

Date Commit Author Message
2025-11-11 17:53:41 openshift/operator-framework-operator-controller@24b7bf5 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-11 17:53:42 openshift/operator-framework-operator-controller@ecc068f Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-11 17:53:43 openshift/operator-framework-operator-controller@4696f9d Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@0ef7823 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-11 17:53:44 openshift/operator-framework-operator-controller@585c904 Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@3f60915 Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-11 17:53:45 openshift/operator-framework-operator-controller@69e68c6 Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-11 17:53:46 openshift/operator-framework-operator-controller@41a7d65 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@02d96e6 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-11 17:53:47 openshift/operator-framework-operator-controller@2d7529e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@d4d89f1 Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-11 17:53:48 openshift/operator-framework-operator-controller@6a4290c Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@262f4fc Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-11 17:53:49 openshift/operator-framework-operator-controller@6e242b6 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-11 17:53:51 openshift/operator-framework-operator-controller@5055bad Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-11 17:53:52 openshift/operator-framework-operator-controller@fc15dd5 Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-11-11 18:37:21 openshift/operator-framework-operator-controller@0572202 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-11-14 10:14:02 openshift/operator-framework-operator-controller@e2f03af Kui Wang UPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases

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 openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2025
@Xia-Zhao-rh
Copy link

/verified by @Xia-Zhao-rh

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

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

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.

@perdasilva
Copy link
Contributor

/lgtm

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

tmshort commented Nov 14, 2025

/test openshift-e2e-aws

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 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/okd-scos-e2e-aws-ovn 1f6be6a link false /test okd-scos-e2e-aws-ovn

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 009fb19 into openshift:main Nov 14, 2025
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. kind/sync lgtm Indicates that a PR is ready to be merged. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants