Skip to content

NO-ISSUE: Synchronize From Upstream Repositories - #582

Merged
openshift-merge-bot[bot] merged 83 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream
Jan 13, 2026
Merged

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

Conversation

@openshift-bot

@openshift-botopenshift-bot commented Dec 12, 2025

Copy link
Copy Markdown

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

DateCommitAuthorMessage
2026-01-10 07:51:15operator-framework/operator-controller@9d8fda0Jordan Keisterfreshen maintainer list (#2438)
2026-01-09 16:59:01operator-framework/operator-controller@fc77915Predrag KnezevicDiscover service namespace in e2e metrics tests (#2437)
2026-01-08 09:42:43operator-framework/operator-controller@ba665c7dependabot[bot]🌱 Bump pkg.package-operator.run/boxcutter from 0.7.1 to 0.8.0 (#2396)
2026-01-08 07:02:22operator-framework/operator-controller@36a46dcdependabot[bot]🌱 Bump urllib3 from 2.6.2 to 2.6.3 (#2434)
2026-01-07 15:06:21operator-framework/operator-controller@b871e7eCamila MacedoFix ClusterCatalog Priority field validation markers (#2432)
2026-01-07 08:08:29operator-framework/operator-controller@5227a12oceanc80📖 Clarify install mode docs (#2430)
2026-01-07 03:08:47operator-framework/operator-controller@25aa763Jordan Keisterstandardizing approach for required-tests-with-occasional-overrides (#2431)
2026-01-06 17:39:49operator-framework/operator-controller@bcb3d07Camila MacedoPromote Single Own Feature Gate AND Config spec in the CR to GA (#2428)
2026-01-06 17:37:01operator-framework/operator-controller@69c099cTodd Short🌱 [Updated] Bump sigs.k8s.io/controller-tools from 0.19.0 to 0.20.0 in the k8s-dependencies group (#2427)
2026-01-06 17:34:13operator-framework/operator-controller@5d85febCamila Macedo(fix) Api documentation (#2409)
2026-01-05 21:45:52operator-framework/operator-controller@dba48b9Camila MacedoFix command and shell consider fixed sceanrios (#2410)
2026-01-05 12:21:05operator-framework/operator-controller@a441661dependabot[bot]🌱 Bump actions/upload-artifact from 5 to 6 (#2418)
2026-01-05 09:45:35operator-framework/operator-controller@f761bf0Camila MacedoUpgrade controller-gen from v0.19.0 to v0.20.0 (#2425)
2026-01-02 13:34:28operator-framework/operator-controller@a6296abPredrag KnezevicFix unaddressed comments on PR #2393 (#2402)
2026-01-01 17:37:28operator-framework/operator-controller@0f92032dependabot[bot]🌱 Bump soupsieve from 2.8 to 2.8.1 (#2424)
2026-01-01 17:34:46operator-framework/operator-controller@bb38c15dependabot[bot]🌱 Bump mkdocs-material from 9.7.0 to 9.7.1 (#2423)
2026-01-01 17:31:24operator-framework/operator-controller@4c38f19dependabot[bot]🌱 Bump github.com/BurntSushi/toml from 1.5.0 to 1.6.0 (#2422)
2026-01-01 17:28:45operator-framework/operator-controller@d16e1d7dependabot[bot]🌱 Bump github.com/containerd/containerd from 1.7.29 to 1.7.30 (#2421)
2025-12-29 16:50:42operator-framework/operator-controller@4acd04fdependabot[bot]🌱 Bump pymdown-extensions from 10.19 to 10.19.1 (#2419)
2025-12-26 18:13:44operator-framework/operator-controller@109ecdcdependabot[bot]🌱 Bump pymdown-extensions from 10.18 to 10.19 (#2417)
2025-12-26 18:10:58operator-framework/operator-controller@48f2e3edependabot[bot]🌱 Bump urllib3 from 2.6.1 to 2.6.2 (#2416)
2025-12-26 18:08:19operator-framework/operator-controller@d8a5063dependabot[bot]🌱 Bump helm.sh/helm/v3 from 3.19.3 to 3.19.4 (#2415)
2025-12-26 18:05:27operator-framework/operator-controller@b515cd4dependabot[bot]🌱 Bump codecov/codecov-action from 5.5.1 to 5.5.2 (#2412)
2025-12-26 16:12:03operator-framework/operator-controller@5ae294adependabot[bot]🌱 Bump github.com/operator-framework/api from 0.36.0 to 0.37.0 (#2414)
2025-12-24 10:28:06operator-framework/operator-controller@bd540c9Camila MacedoAdd camilamacedo86 to approvers (#2408)
2025-12-24 10:25:19operator-framework/operator-controller@882c344dependabot[bot]🌱 Bump golang.org/x/tools from 0.39.0 to 0.40.0 (#2405)
2025-12-24 09:27:15operator-framework/operator-controller@19f7d39dependabot[bot]🌱 Bump golang.org/x/mod from 0.30.0 to 0.31.0 (#2404)
2025-12-24 08:56:55operator-framework/operator-controller@3992ea0dependabot[bot]🌱 Bump urllib3 from 2.6.0 to 2.6.1 (#2406)
2025-12-24 08:54:02operator-framework/operator-controller@0baa4badependabot[bot]🌱 Bump github.com/cert-manager/cert-manager (#2403)
2025-12-24 08:51:21operator-framework/operator-controller@77eded4dependabot[bot]🌱 Bump pymdown-extensions from 10.17.2 to 10.18 (#2401)
2025-12-23 13:10:04operator-framework/operator-controller@578dc33Camila MacedoAdd CLAUDE command and new check to review and lint the API changes (#2399)
2025-12-19 21:43:46operator-framework/operator-controller@08436e0Predrag KnezevicMigrate E2e NetworkPolicy tests to static analysis with kube-score and conftest (#2393)
2025-12-19 21:13:21operator-framework/operator-controller@2b94dbcTodd ShortUpdate go version to 1.25.3 (#2400)
2025-12-19 14:25:03operator-framework/operator-controller@90cd55adependabot[bot]🌱 Bump platformdirs from 4.5.0 to 4.5.1 (#2397)
2025-12-19 13:02:27operator-framework/operator-controller@a85d6d1Camila MacedoUpdate using bingo golang-ci from v2.6.2 to v2.7.2 (#2395)
2025-12-18 14:47:00operator-framework/operator-controller@cc8ed2bdependabot[bot]🌱 Bump github.com/spf13/cobra from 1.10.1 to 1.10.2 (#2392)
2025-12-18 14:44:03operator-framework/operator-controller@410f092dependabot[bot]🌱 Bump golang.org/x/sync from 0.18.0 to 0.19.0 (#2391)
2025-12-18 11:29:30operator-framework/operator-controller@aea576cMichael PeterUpdating docs strings for API go definitions (#2359)
2025-12-17 18:35:02operator-framework/operator-controller@c5d9fedTodd ShortUpdate goreleaser to v2.11.2 (#2390)
2025-12-16 20:53:04operator-framework/operator-controller@aaffdebPredrag KnezevicMigrate e2e tests to Godog BDD framework (#2365)
2025-12-15 15:09:46operator-framework/operator-controller@96ce9e5dependabot[bot]🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
2025-12-15 15:04:04operator-framework/operator-controller@b76407adependabot[bot]🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
2025-12-12 17:05:04operator-framework/operator-controller@87b2a72Todd ShortMove the kind configs into a subdirectory (#2384)
2025-12-12 16:26:26operator-framework/operator-controller@841cbdeTodd ShortChange the experimental-e2e to use a two-node kind cluster (#2382)

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

DateCommitAuthorMessage
2025-12-12 11:03:28openshift/operator-framework-operator-controller@c3d845edtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-12-12 11:03:29openshift/operator-framework-operator-controller@00cf1ddCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-12-12 11:03:30openshift/operator-framework-operator-controller@9b059fbCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-12-12 11:03:31openshift/operator-framework-operator-controller@41e4bc9Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-12-12 11:03:31openshift/operator-framework-operator-controller@dc7d611Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-12-12 11:03:32openshift/operator-framework-operator-controller@c53468bKui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-12-12 11:03:33openshift/operator-framework-operator-controller@332ed3bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-12-12 11:03:34openshift/operator-framework-operator-controller@f16ae61Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-12-12 11:03:35openshift/operator-framework-operator-controller@8afafe7Todd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-12-12 11:03:36openshift/operator-framework-operator-controller@f15b05aCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-12-12 11:03:36openshift/operator-framework-operator-controller@9ead299Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-12-12 11:03:37openshift/operator-framework-operator-controller@72f8b77Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-12-12 11:03:38openshift/operator-framework-operator-controller@d96be3dCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-12-12 11:03:39openshift/operator-framework-operator-controller@802d985Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-12-12 11:03:40openshift/operator-framework-operator-controller@79cf38dCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-12-12 11:03:41openshift/operator-framework-operator-controller@4413ffaCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-12-12 11:03:42openshift/operator-framework-operator-controller@0e108cfCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-12-12 11:03:43openshift/operator-framework-operator-controller@53ad267Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-12-12 11:03:43openshift/operator-framework-operator-controller@cbc511bJian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-12-12 11:03:44openshift/operator-framework-operator-controller@9d695f9Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2025-12-12 11:03:45openshift/operator-framework-operator-controller@678429aKui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2025-12-12 11:03:46openshift/operator-framework-operator-controller@4c6b45bTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2025-12-12 11:03:47openshift/operator-framework-operator-controller@8d95df7Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2025-12-12 11:03:47openshift/operator-framework-operator-controller@971fefdKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2025-12-12 11:03:48openshift/operator-framework-operator-controller@ae8c55eTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2025-12-12 11:03:49openshift/operator-framework-operator-controller@4ff4713Rashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2025-12-12 11:03:50openshift/operator-framework-operator-controller@28bbf8aRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2025-12-12 11:03:51openshift/operator-framework-operator-controller@c3bac39Rashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2025-12-12 11:03:52openshift/operator-framework-operator-controller@cdfd5b1Rashmi GottipatiUPSTREAM: <carry>: remove DCO line
2025-12-02 21:12:37openshift/operator-framework-operator-controller@7357586Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2025-12-02 22:44:07openshift/operator-framework-operator-controller@9cec271Bruno AndradeUPSTREAM: <carry>: update metadata
2025-12-03 07:05:07openshift/operator-framework-operator-controller@de93981Bruno AndradeUPSTREAM: <carry>: remove originalName
2025-12-08 10:40:41openshift/operator-framework-operator-controller@410181dJian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2025-12-15 16:26:25openshift/operator-framework-operator-controller@0068b9eJian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2025-12-18 15:08:07openshift/operator-framework-operator-controller@736240fCatherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22

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

In order to fully support multiple replicas, we need to be able to run
our tests in a multi-node environment, but we don't _always_ want to
run in a multi-node test environment.
Update the experimental-e2e to run a 2-node kind cluster (both control-
plane).
Update the `kind-load` recipe to directly load a docker image via
`load docker-image`, since `load image-archive` has issues with
multi-node clusters.
Signed-off-by: Todd Short <tshort@redhat.com>
Rather than litter the root directory with kind configs, add them to
a subdirectory.
Also rename the experimental one to indicate it's for 2 nodes.
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 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 Dec 12, 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-12-12 17:05:04operator-framework/operator-controller@87b2a72Todd ShortMove the kind configs into a subdirectory (#2384)
2025-12-12 16:26:26operator-framework/operator-controller@841cbdeTodd ShortChange the experimental-e2e to use a two-node kind cluster (#2382)

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

DateCommitAuthorMessage
2025-12-12 11:03:28openshift/operator-framework-operator-controller@c3d845edtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-12-12 11:03:29openshift/operator-framework-operator-controller@00cf1ddCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-12-12 11:03:30openshift/operator-framework-operator-controller@9b059fbCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-12-12 11:03:31openshift/operator-framework-operator-controller@41e4bc9Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-12-12 11:03:31openshift/operator-framework-operator-controller@dc7d611Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-12-12 11:03:32openshift/operator-framework-operator-controller@c53468bKui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-12-12 11:03:33openshift/operator-framework-operator-controller@332ed3bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-12-12 11:03:34openshift/operator-framework-operator-controller@f16ae61Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-12-12 11:03:35openshift/operator-framework-operator-controller@8afafe7Todd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-12-12 11:03:36openshift/operator-framework-operator-controller@f15b05aCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-12-12 11:03:36openshift/operator-framework-operator-controller@9ead299Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-12-12 11:03:37openshift/operator-framework-operator-controller@72f8b77Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-12-12 11:03:38openshift/operator-framework-operator-controller@d96be3dCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-12-12 11:03:39openshift/operator-framework-operator-controller@802d985Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-12-12 11:03:40openshift/operator-framework-operator-controller@79cf38dCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-12-12 11:03:41openshift/operator-framework-operator-controller@4413ffaCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-12-12 11:03:42openshift/operator-framework-operator-controller@0e108cfCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-12-12 11:03:43openshift/operator-framework-operator-controller@53ad267Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-12-12 11:03:43openshift/operator-framework-operator-controller@cbc511bJian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-12-12 11:03:44openshift/operator-framework-operator-controller@9d695f9Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2025-12-12 11:03:45openshift/operator-framework-operator-controller@678429aKui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2025-12-12 11:03:46openshift/operator-framework-operator-controller@4c6b45bTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2025-12-12 11:03:47openshift/operator-framework-operator-controller@8d95df7Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2025-12-12 11:03:47openshift/operator-framework-operator-controller@971fefdKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2025-12-12 11:03:48openshift/operator-framework-operator-controller@ae8c55eTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2025-12-12 11:03:49openshift/operator-framework-operator-controller@4ff4713Rashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2025-12-12 11:03:50openshift/operator-framework-operator-controller@28bbf8aRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2025-12-12 11:03:51openshift/operator-framework-operator-controller@c3bac39Rashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2025-12-12 11:03:52openshift/operator-framework-operator-controller@cdfd5b1Rashmi GottipatiUPSTREAM: <carry>: remove DCO line

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-robotopenshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 12, 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-12-12 17:05:04operator-framework/operator-controller@87b2a72Todd ShortMove the kind configs into a subdirectory (#2384)
2025-12-12 16:26:26operator-framework/operator-controller@841cbdeTodd ShortChange the experimental-e2e to use a two-node kind cluster (#2382)

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

DateCommitAuthorMessage
2025-12-12 11:03:28openshift/operator-framework-operator-controller@c3d845edtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-12-12 11:03:29openshift/operator-framework-operator-controller@00cf1ddCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-12-12 11:03:30openshift/operator-framework-operator-controller@9b059fbCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-12-12 11:03:31openshift/operator-framework-operator-controller@41e4bc9Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-12-12 11:03:31openshift/operator-framework-operator-controller@dc7d611Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-12-12 11:03:32openshift/operator-framework-operator-controller@c53468bKui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-12-12 11:03:33openshift/operator-framework-operator-controller@332ed3bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-12-12 11:03:34openshift/operator-framework-operator-controller@f16ae61Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-12-12 11:03:35openshift/operator-framework-operator-controller@8afafe7Todd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-12-12 11:03:36openshift/operator-framework-operator-controller@f15b05aCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-12-12 11:03:36openshift/operator-framework-operator-controller@9ead299Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-12-12 11:03:37openshift/operator-framework-operator-controller@72f8b77Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-12-12 11:03:38openshift/operator-framework-operator-controller@d96be3dCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-12-12 11:03:39openshift/operator-framework-operator-controller@802d985Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-12-12 11:03:40openshift/operator-framework-operator-controller@79cf38dCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-12-12 11:03:41openshift/operator-framework-operator-controller@4413ffaCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-12-12 11:03:42openshift/operator-framework-operator-controller@0e108cfCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-12-12 11:03:43openshift/operator-framework-operator-controller@53ad267Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-12-12 11:03:43openshift/operator-framework-operator-controller@cbc511bJian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-12-12 11:03:44openshift/operator-framework-operator-controller@9d695f9Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2025-12-12 11:03:45openshift/operator-framework-operator-controller@678429aKui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2025-12-12 11:03:46openshift/operator-framework-operator-controller@4c6b45bTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2025-12-12 11:03:47openshift/operator-framework-operator-controller@8d95df7Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2025-12-12 11:03:47openshift/operator-framework-operator-controller@971fefdKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2025-12-12 11:03:48openshift/operator-framework-operator-controller@ae8c55eTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2025-12-12 11:03:49openshift/operator-framework-operator-controller@4ff4713Rashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2025-12-12 11:03:50openshift/operator-framework-operator-controller@28bbf8aRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2025-12-12 11:03:51openshift/operator-framework-operator-controller@c3bac39Rashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2025-12-12 11:03:52openshift/operator-framework-operator-controller@cdfd5b1Rashmi GottipatiUPSTREAM: <carry>: remove DCO line

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

Copy link
Copy Markdown
Contributor

/verified bypass

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

Copy link
Copy Markdown

@jianzhangbjz: The verified label has been added.

Details

In response to this:

/verified bypass

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.

Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.14.2 to 4.14.3.
---
updated-dependencies:
- dependency-name: beautifulsoup4
dependency-version: 4.14.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 [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](klauspost/compress@v1.18.1...v1.18.2)
---
updated-dependencies:
- dependency-name: github.com/klauspost/compress
dependency-version: 1.18.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>
@openshift-ci-robotopenshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Dec 16, 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-12-15 15:09:46operator-framework/operator-controller@96ce9e5dependabot[bot]🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
2025-12-15 15:04:04operator-framework/operator-controller@b76407adependabot[bot]🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
2025-12-12 17:05:04operator-framework/operator-controller@87b2a72Todd ShortMove the kind configs into a subdirectory (#2384)
2025-12-12 16:26:26operator-framework/operator-controller@841cbdeTodd ShortChange the experimental-e2e to use a two-node kind cluster (#2382)

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

DateCommitAuthorMessage
2025-12-12 11:03:28openshift/operator-framework-operator-controller@c3d845edtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-12-12 11:03:29openshift/operator-framework-operator-controller@00cf1ddCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-12-12 11:03:30openshift/operator-framework-operator-controller@9b059fbCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-12-12 11:03:31openshift/operator-framework-operator-controller@41e4bc9Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-12-12 11:03:31openshift/operator-framework-operator-controller@dc7d611Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-12-12 11:03:32openshift/operator-framework-operator-controller@c53468bKui WangUPSTREAM: <carry>: support singleown cases in disconnected
2025-12-12 11:03:33openshift/operator-framework-operator-controller@332ed3bKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-12-12 11:03:34openshift/operator-framework-operator-controller@f16ae61Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-12-12 11:03:35openshift/operator-framework-operator-controller@8afafe7Todd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2025-12-12 11:03:36openshift/operator-framework-operator-controller@f15b05aCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-12-12 11:03:36openshift/operator-framework-operator-controller@9ead299Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-12-12 11:03:37openshift/operator-framework-operator-controller@72f8b77Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-12-12 11:03:38openshift/operator-framework-operator-controller@d96be3dCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-12-12 11:03:39openshift/operator-framework-operator-controller@802d985Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2025-12-12 11:03:40openshift/operator-framework-operator-controller@79cf38dCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-12-12 11:03:41openshift/operator-framework-operator-controller@4413ffaCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2025-12-12 11:03:42openshift/operator-framework-operator-controller@0e108cfCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2025-12-12 11:03:43openshift/operator-framework-operator-controller@53ad267Kui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2025-12-12 11:03:43openshift/operator-framework-operator-controller@cbc511bJian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2025-12-12 11:03:44openshift/operator-framework-operator-controller@9d695f9Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2025-12-12 11:03:45openshift/operator-framework-operator-controller@678429aKui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2025-12-12 11:03:46openshift/operator-framework-operator-controller@4c6b45bTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2025-12-12 11:03:47openshift/operator-framework-operator-controller@8d95df7Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2025-12-12 11:03:47openshift/operator-framework-operator-controller@971fefdKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2025-12-12 11:03:48openshift/operator-framework-operator-controller@ae8c55eTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2025-12-12 11:03:49openshift/operator-framework-operator-controller@4ff4713Rashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2025-12-12 11:03:50openshift/operator-framework-operator-controller@28bbf8aRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2025-12-12 11:03:51openshift/operator-framework-operator-controller@c3bac39Rashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2025-12-12 11:03:52openshift/operator-framework-operator-controller@cdfd5b1Rashmi GottipatiUPSTREAM: <carry>: remove DCO line

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-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2025
@jianzhangbjz

Copy link
Copy Markdown
Contributor

/verified by pass

@openshift-ci-robot

Copy link
Copy Markdown

@jianzhangbjz: Jira verification commands are restricted to collaborators for this repo.

Details

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.

Replace traditional Go e2e tests with Godog (Cucumber for Go) to improve
test readability and maintainability through behavior-driven development.
Changes:
- Convert existing test scenarios to Gherkin feature files
- Implement reusable step definitions in steps/steps.go
- Add scenario hooks for setup/teardown and feature gate detection
- Provide comprehensive documentation in test/e2e/README.md
- Remove legacy test files (cluster_extension_install_test.go, etc.)
Benefits:
- Human-readable test scenarios serve as living documentation
- Better separation between test specification and implementation
- Easier collaboration between technical and non-technical stakeholders
- Reduced code duplication through reusable step definitions
Assisted-By: "Claude <noreply@anthropic.com>"
@tmshort

Copy link
Copy Markdown
Contributor

/test okd-scos-images

@tmshort

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2025
This version requires golang 1.24.6 (which is our max version) but also
supports golang 1.25.3. This is the maximum version of goreleaser that
we can move to given our golang version constraints of having to support
golang 1.24 while moving to golang 1.25.
Updates the config file to v2
Signed-off-by: Todd Short <tshort@redhat.com>
camilamacedo86and others added 23 commits January 11, 2026 00:07
… 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>
The current pod simply does a `sleep 1000`, which means that the startup,
liveness and readiness probes all fail. Use a busybox containter to run a
simple script and httpd server to emulate the probes.
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
@openshift-botopenshift-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2026
@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2026
@openshift-ci

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@openshift-ci

openshift-ciBot commented Jan 11, 2026

Copy link
Copy Markdown
Contributor

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

Test nameCommitDetailsRequiredRerun command
ci/prow/openshift-e2e-aws58a6875linktrue/test openshift-e2e-aws

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.

@tmshort

Copy link
Copy Markdown
Contributor

/test okd-scos-images

@tmshort

Copy link
Copy Markdown
Contributor

/hold

Prefer #597. will close once that's merged.,

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.do-not-merge/holdIndicates that a PR should not merge because someone has issued a /hold command.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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

15 participants

@openshift-bot@openshift-ci-robot@jianzhangbjz@tmshort@perdasilva@camilamacedo86@pedjak@michaelryanpeter@grokspawn@oceanc80@dtfranz@kuiwang02@Xia-Zhao-rh@rashmigottipati@bandrade