Skip to content

OCPBUGS-85508: Synchronize From Upstream Repositories - #725

Merged
openshift-merge-bot[bot] merged 99 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream
May 14, 2026
Merged

OCPBUGS-85508: Synchronize From Upstream Repositories#725
openshift-merge-bot[bot] merged 99 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream

Conversation

@openshift-bot

@openshift-botopenshift-bot commented May 13, 2026

Copy link
Copy Markdown

JIRA Tickets:

  • OCPBUGS-85508

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

DateCommitAuthorMessage
2026-05-13 19:09:05operator-framework/operator-controller@f120442Joe Lanfordfix: reduce chunked storage ChunkSize to fit within Kubernetes Secret limit (#2702)
2026-05-13 18:41:35operator-framework/operator-controller@f691ffeJordan Keisterbump op-reg (#2703)
2026-05-13 16:32:51operator-framework/operator-controller@0d6fcd2Predrag KnezevicAdd test-identifying annotations to e2e resources (#2701)
2026-05-13 16:21:47operator-framework/operator-controller@ea60813Daniel FranzConcurrent Test Execution (#2675)
2026-05-13 15:19:28operator-framework/operator-controller@c02fe46Predrag KnezevicPass all feature gates explicitly in controller deployments (#2700)

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

DateCommitAuthorMessage
2026-05-12 15:39:45openshift/operator-framework-operator-controller@4262df3dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-05-12 15:39:46openshift/operator-framework-operator-controller@a023f75Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-05-12 15:39:46openshift/operator-framework-operator-controller@e831cf7Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-05-12 15:39:47openshift/operator-framework-operator-controller@455259dCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-05-12 15:39:47openshift/operator-framework-operator-controller@52514a8Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-05-12 15:39:48openshift/operator-framework-operator-controller@7924fc1Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-05-12 15:39:49openshift/operator-framework-operator-controller@417374fKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-05-12 15:39:49openshift/operator-framework-operator-controller@bc15625Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-05-12 15:39:50openshift/operator-framework-operator-controller@cdcad4dTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-05-12 15:39:50openshift/operator-framework-operator-controller@33ec00cCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-05-12 15:39:51openshift/operator-framework-operator-controller@53fd9a1Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-05-12 15:39:51openshift/operator-framework-operator-controller@ca5db7bKui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-05-12 15:39:52openshift/operator-framework-operator-controller@fc953aeCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-05-12 15:39:52openshift/operator-framework-operator-controller@f8c86afKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-05-12 15:39:54openshift/operator-framework-operator-controller@ca23ba9Camila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-05-12 15:39:54openshift/operator-framework-operator-controller@515dfefCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-05-12 15:39:55openshift/operator-framework-operator-controller@f421f3cCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-05-12 15:39:56openshift/operator-framework-operator-controller@1361c9bKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-05-12 15:39:57openshift/operator-framework-operator-controller@230e956Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-05-12 15:39:57openshift/operator-framework-operator-controller@616f13bXia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2493db0Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2861d7aTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-05-12 15:39:59openshift/operator-framework-operator-controller@1d88a69Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-05-12 15:39:59openshift/operator-framework-operator-controller@9e12a8fKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-05-12 15:40:00openshift/operator-framework-operator-controller@4509dd1Todd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-05-12 15:40:00openshift/operator-framework-operator-controller@ea2319aRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-05-12 15:40:01openshift/operator-framework-operator-controller@90bf024Rashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-05-12 15:40:01openshift/operator-framework-operator-controller@dbda18cRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-05-12 15:40:01openshift/operator-framework-operator-controller@d250815Rashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-05-12 15:40:02openshift/operator-framework-operator-controller@8310c66Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-05-12 15:40:02openshift/operator-framework-operator-controller@2cb2f0dBruno AndradeUPSTREAM: <carry>: update metadata
2026-05-12 15:40:03openshift/operator-framework-operator-controller@1ce2d9bBruno AndradeUPSTREAM: <carry>: remove originalName
2026-05-12 15:40:03openshift/operator-framework-operator-controller@2985abeJian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-05-12 15:40:04openshift/operator-framework-operator-controller@4252770Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-05-12 15:40:04openshift/operator-framework-operator-controller@1fc1251Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-05-12 15:40:05openshift/operator-framework-operator-controller@aa94ad3Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-05-12 15:40:05openshift/operator-framework-operator-controller@488ff87Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-05-12 15:40:06openshift/operator-framework-operator-controller@6f5129fKui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-05-12 15:40:06openshift/operator-framework-operator-controller@8d3a83bEvan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:07openshift/operator-framework-operator-controller@677717dEvan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-05-12 15:40:07openshift/operator-framework-operator-controller@768552aEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-05-12 15:40:08openshift/operator-framework-operator-controller@2166e5aEvan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-05-12 15:40:08openshift/operator-framework-operator-controller@6931ebdEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-05-12 15:40:09openshift/operator-framework-operator-controller@b14cd2dLuke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-05-12 15:40:09openshift/operator-framework-operator-controller@1f6e5a5Camila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-05-12 15:40:10openshift/operator-framework-operator-controller@bde5720Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-05-12 15:40:10openshift/operator-framework-operator-controller@a66546dXia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-05-12 15:40:11openshift/operator-framework-operator-controller@2470473Kui WangUPSTREAM: <carry>: upgrade version support case
2026-05-12 15:40:11openshift/operator-framework-operator-controller@ebb31e2Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-05-12 15:40:12openshift/operator-framework-operator-controller@e361b44Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-05-12 15:40:12openshift/operator-framework-operator-controller@c0732f4Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-05-12 15:40:13openshift/operator-framework-operator-controller@6298e08Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-05-12 15:40:14openshift/operator-framework-operator-controller@433cbecCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-05-12 15:40:14openshift/operator-framework-operator-controller@37a09d0Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@c3ca4e3Bruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@8d77f61Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-05-12 15:40:16openshift/operator-framework-operator-controller@7ed4699Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-05-12 15:40:16openshift/operator-framework-operator-controller@0e6a2e2Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-05-12 15:40:17openshift/operator-framework-operator-controller@fc2ef52Kui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-05-12 15:40:17openshift/operator-framework-operator-controller@6c29e8fCamila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-05-12 15:40:18openshift/operator-framework-operator-controller@f873be3Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-05-12 15:40:19openshift/operator-framework-operator-controller@dd369d2Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-05-12 15:40:19openshift/operator-framework-operator-controller@e7c8169Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-05-12 15:40:20openshift/operator-framework-operator-controller@baf92aaStephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-05-12 15:40:20openshift/operator-framework-operator-controller@0ef291fCamila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-05-12 15:40:21openshift/operator-framework-operator-controller@9f62842Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:21openshift/operator-framework-operator-controller@937fd30Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7d97b97Kui WangUPSTREAM: <carry>: deployment config cases
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7c56c64Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-05-12 15:40:23openshift/operator-framework-operator-controller@98307a0Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-05-12 15:40:23openshift/operator-framework-operator-controller@335ac58Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-05-12 15:40:24openshift/operator-framework-operator-controller@38c85ebXia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-05-12 15:40:24openshift/operator-framework-operator-controller@3f63102Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-05-12 15:40:25openshift/operator-framework-operator-controller@8ef69d2Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-05-12 15:40:25openshift/operator-framework-operator-controller@b2969e1Jian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-05-12 15:40:26openshift/operator-framework-operator-controller@6d9279dTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-05-12 15:40:26openshift/operator-framework-operator-controller@670055aCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-05-12 15:40:27openshift/operator-framework-operator-controller@26fa0dfCamila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-05-12 15:40:27openshift/operator-framework-operator-controller@aacb7eeBruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-05-12 15:40:28openshift/operator-framework-operator-controller@8819a16Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-05-12 15:40:28openshift/operator-framework-operator-controller@4ddf7c9Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-05-12 15:40:29openshift/operator-framework-operator-controller@4ffaefdKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-05-12 15:40:29openshift/operator-framework-operator-controller@64ab52eCamila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-05-12 15:40:30openshift/operator-framework-operator-controller@3c85566Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-05-12 15:40:30openshift/operator-framework-operator-controller@87e1240Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-05-12 15:40:31openshift/operator-framework-operator-controller@5ef8edaCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP
2026-05-12 15:40:31openshift/operator-framework-operator-controller@0a86725Camila MacedoUPSTREAM: <carry>: OTE - Make OTE local output easier to read
2026-05-12 15:40:32openshift/operator-framework-operator-controller@ac8e783Joe LanfordUPSTREAM: <carry>: remove dead e2e registry push job and related variables
2026-05-12 15:40:32openshift/operator-framework-operator-controller@517a14dTodd ShortUPSTREAM: <carry>: OCPBUGS-62517: Set replicas=1, PDB, and pod anti-affinity for HA topology
2026-05-12 15:40:33openshift/operator-framework-operator-controller@b2a6546Todd ShortUPSTREAM: <carry>: fix(test): drop blocking namespace-deletion wait between both-watch-modes scenarios

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.

/assign @openshift/openshift-team-operator-runtime

pedjakand others added 30 commits May 13, 2026 15:19
Previously, only non-default feature gates were passed as --feature-gates
args to controller pods. Standard deployments had no feature gate args at
all, and experimental deployments only listed flags that differed from
defaults. This made it impossible to determine the active feature gate
configuration by inspecting a running deployment or pod spec.
Now all 10 feature gates (9 operator-controller + 1 catalogd) are listed
explicitly in every deployment variant, improving readability when
inspecting deployments or pods.
WebhookProviderOpenshiftServiceCA is listed as disabled in standard
defaults because getCertificateProvider() checks WebhookProviderCertManager
first — when both are enabled, OpenshiftServiceCA has no effect.
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Takes advantage of changes made to isolate test runs to execute as many tests in parallel as possible. For tests that must be run serially, the @serial tag has been added to the beginning of relevant feature file(s).
Signed-off-by: Daniel Franz <dfranz@redhat.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Inject e2e.olm.operatorframework.io/feature and
e2e.olm.operatorframework.io/scenario annotations into every resource
applied during an e2e scenario. This makes it possible to identify which
feature file and scenario produced a given resource when debugging test
failures on a cluster.
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: grokspawn <jordan@nimblewidget.com>
… limit (#2702)
OCPBUGS-85508
The chunked Helm release storage driver set ChunkSize to exactly 1MB
(1,048,576 bytes), which is the Kubernetes Secret data limit. The index
Secret stores both the first chunk and a JSON list of extra chunk names
(extraChunks), so any release requiring chunking exceeded the limit:
Secret "sh.helm.release.v1.odf-operator.v1" is invalid:
data: Too long: may not be more than 1048576 bytes
Reduce ChunkSize to (1024-8)*1024 (1,040,384 bytes), leaving 8KB of
headroom for the extraChunks field, and increase MaxReadChunks and
MaxWriteChunks from 10 to 11 to maintain total capacity above the
previous theoretical maximum.
Signed-off-by: dtfranz <dfranz@redhat.com>
UPSTREAM: <carry>: Update generate-manifests to handle new directory
The `default` directory was renamed `base`.
Signed-off-by: Todd Short <todd.short@me.com>
The `base` directory was moved to `base\operator-controller`.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Drop commitchecker
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART
Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: update owners
* Remove alumni from owners
* Add m1kola to approvers
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
UPSTREAM: <carry>: Add pointer to tooling README
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16
Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
* This reverts commit 3f079c4.
* Includes Validating Admission Policy manifests
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: add everettraven to approvers+reviewers
Signed-off-by: everettraven <everettraven@gmail.com>
UPSTREAM: <carry>: add openshift kustomize overlay
to enable TLS communication with catalogd. Configure the CA certs
using the configmap injection method via service-ca-operator
Signed-off-by: everettraven <everettraven@gmail.com>
UPSTREAM: <carry>: Add tmshort to approvers
Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18
Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: Properly copy and call kustomize
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
Signed-off-by: dtfranz <dfranz@redhat.com>
UPSTREAM: <carry>: Add downstream verify makefile target
Signed-off-by: dtfranz <dfranz@redhat.com>
UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Add global-pull-secret flag
Pass global-pull-secret to the manager container.
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
UPSTREAM: <carry>: Update openshift CAs to operator-controller
The /run/secrets/kubernetes.io/serviceaccount/ directory is projected
into the pod and contains the following CA certificates:
* configmap/kube-root-ca.crt as ca.crt
* configmap/openshift-service-ca.crt as service-ca.crt
Update the --ca-certs-dir argument to reference the directory.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Add HowTo for origin tests
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Add e2e registry Dockerfile
Signed-off-by: dtfranz <dfranz@redhat.com>
UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
Signed-off-by: everettraven <everettraven@gmail.com>
UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Enable downstream e2e
Signed-off-by: dtfranz <dfranz@redhat.com>
UPSTREAM: <carry>: Remove m1kola from owners
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19
Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: generate and mount service-ca server cert
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Add support for proxy trustedCAs
Just map the list of trusted ca certs into the deployment
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Fix error to build the image
Copy correct (new) executable name for operator-controller
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Fix make verify for mac os envs
Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Move operator-controller openshift files to its own dir
UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19
UPSTREAM: <carry>: Add Openshift's catalogd manifests
- Move to openshift/catalogd the specific manifest under: https://github.com/openshift/operator-framework-catalogd/tree/main/openshift
- Add call to generate catalogd manifest to 'make manifest'. Make verify test is now done for catalogd and operator-controller Openshift's manifests
UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments
This allows for use of the any image.config.openshift.io trusted CAs
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: fixup catalogd.Dockerfile paths
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations"
This reverts commit 548caa4.
UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
UPSTREAM: <carry>: Remove vet from openshift verify
The `vet` target was removed upstream.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Skip another upstream test
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests
UPSTREAM: <carry>: Enable OCP metrics collection by default
Enables OCP to collect Prometheus metrics for both catalogd and
operator-controller by default. This is accomplished
via ServiceMonitor CRs which are now created for both projects.
UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
The root catalogd directory has been removed
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Add openshift node selector annotation
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
(cherry picked from commit 9b4a113)
UPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: set the SElinux type
Signed-off-by: Jian Zhang <jiazha@redhat.com>
UPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
UPSTREAM: <carry>: Add vendor files for the catalog-sync tests
UPSTREAM: <carry>: Bump catalog versions to 4.19
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
This reverts commit a98980b.
UPSTREAM: <carry>: Update HOWTO-origin-tests
techpreview is no longer a required option.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
UPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
UPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
UPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
UPSTREAM: <carry>: [Default Catalog](cleanp) Remove hack directory which is not used
UPSTREAM: <carry>: Change code implementation to extract layers in OCP env
UPSTREAM: <carry>: Add vendor files for change in the extract code implementation
UPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
UPSTREAM: <carry>: SELinux type for operator-controller
Signed-off-by: Jian Zhang <jiazha@redhat.com>
UPSTREAM: <carry>: Bump catalog versions to 4.19
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
Checks if given paths exist and point to executable files or valid symlinks.
UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-olm-catalogd.yml
UPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
Update the e2e registry Dockerfile to use golang 1.24/OCP 4.20
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
UPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
This commit introduces a binary and supporting structure to enable the
execution of OpenShift origin (olmv1) tests using the Open Test Environment (OTE).
It lays the groundwork for moving origin test in openshift/origin to
be executed from this repository using OTE.
UPSTREAM: <carry>: Add support for experimental manifests
Update the openshift kustomize configuration for both operator-controller
and catalogd.
Update the manifest generation scripts to put the core generation code
into a function (ignore-whitespace will help with the review), so that
it can be called twice; once for standard, and once for experimental.
Move around some of the kustomization directives to
* Create a patch kustomization (Component) file and move the patch directives from olmv1-ns there. This allows it to be referenced from a different directory.
* Add a kustomization file for tusted-ca. This allows it to be referenced from a different directory.
* Move the setting of the namePrefix for operator-controller; this makes the generation compatible with upstream feature components.
* Define experimental kustomization files that reference existing components.
* Reference the correct CRDs (standard or experimental).
* Add references to upstream feature components into the experimental manifests.
This *will* add `--feature-gates` options from the upstream feature
components to the experimental manifests. The cluster-olm-operator will
strip those arguments from the deployments before adding the enabled
feature gates.
Update the Dockerfiles to include the experimental manifests and a copy
script (`cp-manifests`) into the image containers. The complexity of
having multiple sets of manifests mean that the simple initContainer
copy mechanism found in cluster-olm-operator is no longer sufficient.
This attempts to keep backwards compatibility with older versions of
cluster-olm-operator, specifically by keeping the original (standard)
manifests in the original location, and adding the experimental
manifests in a new directory. The new `cp-manifests` script is used
by newer versions of cluster-olm-operator.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [OTE] - chore: follow up openshift#383 – remove unreachable target call
UPSTREAM: <carry>: Remove build of test image registry
Upstream now uses a different image
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
This adds a test-experimental-e2e target to allow the CI to run the
experimental e2e test.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
UPSTREAM: <carry>: Fix experimental manifest copying
The standard manifest was being copied rather than the experimental
manifest. This meant that the expected feature-flags are not present.
This is failing now that we are doing a check for those feature-flags.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [OTE] - Add tracking mechanism
UPSTREAM: <carry>: Update OTE dep to get fix
UPSTREAM: <carry>: [OTE] Add Readme
UPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
UPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
Signed-off-by: Ankita Thomas <ankithom@redhat.com>
UPSTREAM: <carry>: add source commit into binaries when linking
- Removes extra GIT_COMMIT set
- fixup Dockerfiles after rebase
- consider "" unset so build-info can fill commit/date
- double quote go flags & honor GIT_COMMIT if set
- improve robustness of build-info parsing
- Trim whitespace on all version fields
- isUnset and valueOrUnknown now call strings.TrimSpace
- Avoid clobbering values injected via ldflags
- set repoState from build-info only when repoState is still unset
- set version from build-info only when unset and build-info value is non-empty
UPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
UPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
This commit moves the final OLMv1 tests from openshift/origin/test/extended/olm/olmv1.go to their proper location in this repository. This migration is part of a larger effort to streamline development by co-locating tests with the component they validate. This will reduce CI overhead and allow for faster, more atomic changes.
Assisted-by: Gemini
UPSTREAM: <carry>: OTE - How to test locally with OCP instances
UPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
UPSTREAM: <carry>: [OTE] add webhook tests
Migrates OLMv1 webhook operator tests from using external YAML files to
defining resources in Go structs. This change removes file dependencies,
improving test reliability and simplifying test setup.
The migration is a refactoring of code from openshift/origin#30059.
The new code uses better naming conventions and adapts the tests to work
with a controller-runtime client, enhancing test consistency and maintainability.
The migration covers all core test scenarios:
- Validating, mutating, and conversion webhooks.
- Certificate and secret rotation tolerance.
Assisted-by: Gemini
UPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
This test replaces the existing upgrade incompatible test.
The main change is that operator and catalog bundles are created on-the-fly
to support OCP 4.20. This means we are no longer dependent on public
operators for this test.
This creates new bundles in the OCP ImageRegistry, this requires using
a number of OCP APIs, including using a raw API URL to invoke the build.
This is done by invoking an external k8s client (either `oc` or `kubectl`),
and passing it a tarball of the bundle to be created. So, it can't be done
by the golang k8sClient normally available (i.e. the create input is a
tarball not a YAML file).
This introduces the use of go-bindata to store the bundle contents.
It also pulls in openshift mage, buld and operator APIs.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Handle service-ca cert availability/rotation
There is problem when the service-ca certificate is not available at pod start.
This is an issue because the SystemCertPool is created from SSL_CERT_DIR,
which may include the empty service-ca. The SystemCertPool is never regenerated
during the lifetime of the program execution, so it will never get updated when
the service-ca is filled. Thus, we need to use --pull-cas-dir to reference the
CAs that we want to use. This will also allow OLMv1 to reload the service-ca
when it is reloaded (after 2 years, mind you). Removing the SSL_CERT_DIR setting,
and adding the --pull-cas-dir flag ought to be equivalent to what we have now
(i.e. SSL_CERT_DIR and no --pull-cas-dir), except that rotation will be handled
better.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [OTE] add webhook tests
Revert "UPSTREAM: <carry>: [OTE] add webhook tests"
This reverts commit 9963614.
UPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
UPSTREAM: <carry>: Remove bindata generation from build
Using go-bindata is causing problems with ART builds.
This removes the use of go-bindata from the builds.
This will subsequently require that users MANUALLY run
the `bindata` target to refresh the bindata, or use
the `build-update` target.
This is a quickfix to put out the fire.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: [OTE] Add webhook tests
- Add dumping of container logs and `kubectl describe pods` output for better diagnostics.
- Include targeted certificate details dump (`tls.crt` parse) when failures occur.
- Add additional check to verify webhook responsiveness after certificate rotation.
This change is a refactor of code from openshift/origin#30059.
Assisted-by: Gemini
UPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
UPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
Migrated OLMv1 operator preflight checks from using external YAML files to
defining ClusterRole permissions directly in Go structs. This improves test
reliability and simplifies test setup by removing file dependencies.
The changes ensure precise replication of original test scenarios,
including specific permission omissions for services, create verbs,
ClusterRoleBindings, ConfigMap resourceNames, and escalate/bind verbs.
Assisted-by: Gemini
UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
This change is a refactor of code from openshift/origin#30059.
Assisted-by: Gemini
UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present.
UPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
UPSTREAM: <carry>: remove obsolete owners
Signed-off-by: grokspawn <jordan@nimblewidget.com>
UPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
This commit migrates the olmv1_catalog set of tests from openshift/origin
to OTE as part the broad effort to migrate all tests.
Assisted-by: Gemini
UPSTREAM: <carry>: Migrate single/own namespace tests
This commit migrates the OLMv1 single and own namespace watch mode tests from openshift/origin/test/extended/olm/olmv1-singleownnamespace.go to this repository. This is part of the effort to move component-specific tests into their respective downstream locations.
Assisted-by: Gemini
UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present.
This reverts commit 0bb1953.
UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
This reverts commit e9e3220.
UPSTREAM: <carry>: Ensure unique name for bad-catalog tests
UPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
This reverts commit 9cc13d8.
UPSTREAM: <carry>: grant QE approver permission for OTE
UPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
UPSTREAM: <carry>: update operator-controller to v1.5.1
UPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
UPSTREAM: <carry>: add jiazha to approvers
UPSTREAM: <carry>: Create combined manifests for comparison
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Use Helm charts for openshift manifests
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: add support for tests-private cases and add the case
UPSTREAM: <carry>: Fix cp-manifests copying of helm charts
The method used to copy the helm charts is including an extra `helm`
directory in the destination path, that is making the cluster-olm-operator
code just a bit more complicated than it needs to be.
This fixes the copy location.
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Remove kustomize manifests from images and repo
Now that helm manifests are being used to dynamically generate the
manifests, the pre-generated manifests are no longer needed. So,
we can remove them from the repo and the images.
However, because we still want to verify the manifests are "good",
we are still creating a "single-file" version of the manifests
for verification purposes, and to allow us to see what changes
are happening to the manifests (from upstream and/or downstream
sources).
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Add pedjak and trgeiger as reviewers
UPSTREAM: <carry>: migrate more cases from tests-private and enhance suites with filters
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.21
Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-operator-controller.yml
UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.21
Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-catalogd.yml
UPSTREAM: <carry>: OTE: Enable disconnected environment and build test operator controller image
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
UPSTREAM: <carry>: for incompatible test add func to wait builder and deployer SA creation by OCP controller
UPSTREAM: <carry>: Fix VERSION replacement in catalog bindata
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: check kubeconfig only run-test and run-suite
UPSTREAM: <carry>: Clean up cp-manifests
There is no longer a need to copy conditionally
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: Update does-not-exist and simple install to work in a disconnected environment
Signed-off-by: Todd Short <todd.short@me.com>
UPSTREAM: <carry>: support webhook case in disconnected
UPSTREAM: <carry>: Consolidate build API
This consolidates the in-cluster building of a bundle and catalog.
The catalog and bundle bindata are inputs, along with a set of
replacements so that catalog and bundle templates can be used to
create the images.
This can be done in the BeforeEach() for a set of tests that use the
same data.
Signed-off-by: Todd Short <todd.short@me.com>
…images from openshift/catalogd/manifests.yaml
Signed-off-by: Todd Short <todd.short@me.com>
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>
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.
tmshortand others added 5 commits May 13, 2026 19:17
…ffinity for HA topology
Rolling updates in HighlyAvailable clusters leave catalogd and
operator-controller unavailable when the only running pod is evicted
before its replacement is ready.
Fix by defaulting replicas=1 and PDB disabled in the static Helm values
(safe for SNO/External topologies, passes the SNO conformance test that
asserts exactly one replica in SingleReplica topology mode). Add pod
anti-affinity to prefer scheduling replicas on different nodes.
cluster-olm-operator detects the cluster's ControlPlaneTopology at
startup and overrides these values to replicas=2 and PDB enabled when a
HighlyAvailable topology is detected, then re-renders the manifests
before starting controllers. When a topology change is observed at
runtime (exceedingly rare), the operator exits so its deployment
controller restarts it, triggering a fresh Helm render with the correct
values for the new topology.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Todd Short <tshort@redhat.com>
…etween both-watch-modes scenarios
The both-watch-modes test loops over two scenarios (singlens, ownns) inside
a single It block and was blocking on full namespace deletion between them.
This caused flaky 300s timeouts on GCP techpreview clusters where master
nodes run at 94-99% CPU, which starves the namespace controller and makes
namespace termination arbitrarily slow.
The wait was not guarding anything real:
- EnsureCleanupClusterExtension already ensures the CE and CRD are gone;
since CE deletion uses ForegroundPropagation, the ClusterObjectSet teardown
must complete before the CE disappears, meaning all managed resources
(Deployments, Services, etc.) are already deleted at that point.
- The singleown bundle installs no ValidatingWebhookConfiguration or
MutatingWebhookConfiguration, so there is no webhook admission risk.
- Each scenario generates unique namespace names and CRD group suffixes via
rand.String(4), so a terminating namespace from scenario 1 cannot collide
with or interfere with scenario 2's resources.
Trigger both namespace deletions and proceed without waiting. The DeferCleanup
registrations that already exist will handle any residual cleanup after the
spec exits.
Fixes: OCPBUGS-84943
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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. labels May 13, 2026
@openshift-ci-robotopenshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 13, 2026
@openshift-botopenshift-bot added the lgtm Indicates that a PR is ready to be merged. label May 13, 2026
@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 May 13, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

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

JIRA Tickets:

  • OCPBUGS-85508

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

DateCommitAuthorMessage
2026-05-13 19:09:05operator-framework/operator-controller@f120442Joe Lanfordfix: reduce chunked storage ChunkSize to fit within Kubernetes Secret limit (#2702)
2026-05-13 18:41:35operator-framework/operator-controller@f691ffeJordan Keisterbump op-reg (#2703)
2026-05-13 16:32:51operator-framework/operator-controller@0d6fcd2Predrag KnezevicAdd test-identifying annotations to e2e resources (#2701)
2026-05-13 16:21:47operator-framework/operator-controller@ea60813Daniel FranzConcurrent Test Execution (#2675)
2026-05-13 15:19:28operator-framework/operator-controller@c02fe46Predrag KnezevicPass all feature gates explicitly in controller deployments (#2700)

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

DateCommitAuthorMessage
2026-05-12 15:39:45openshift/operator-framework-operator-controller@4262df3dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-05-12 15:39:46openshift/operator-framework-operator-controller@a023f75Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-05-12 15:39:46openshift/operator-framework-operator-controller@e831cf7Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-05-12 15:39:47openshift/operator-framework-operator-controller@455259dCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-05-12 15:39:47openshift/operator-framework-operator-controller@52514a8Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-05-12 15:39:48openshift/operator-framework-operator-controller@7924fc1Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-05-12 15:39:49openshift/operator-framework-operator-controller@417374fKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-05-12 15:39:49openshift/operator-framework-operator-controller@bc15625Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-05-12 15:39:50openshift/operator-framework-operator-controller@cdcad4dTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-05-12 15:39:50openshift/operator-framework-operator-controller@33ec00cCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-05-12 15:39:51openshift/operator-framework-operator-controller@53fd9a1Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-05-12 15:39:51openshift/operator-framework-operator-controller@ca5db7bKui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-05-12 15:39:52openshift/operator-framework-operator-controller@fc953aeCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-05-12 15:39:52openshift/operator-framework-operator-controller@f8c86afKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-05-12 15:39:54openshift/operator-framework-operator-controller@ca23ba9Camila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-05-12 15:39:54openshift/operator-framework-operator-controller@515dfefCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-05-12 15:39:55openshift/operator-framework-operator-controller@f421f3cCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-05-12 15:39:56openshift/operator-framework-operator-controller@1361c9bKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-05-12 15:39:57openshift/operator-framework-operator-controller@230e956Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-05-12 15:39:57openshift/operator-framework-operator-controller@616f13bXia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2493db0Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2861d7aTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-05-12 15:39:59openshift/operator-framework-operator-controller@1d88a69Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-05-12 15:39:59openshift/operator-framework-operator-controller@9e12a8fKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-05-12 15:40:00openshift/operator-framework-operator-controller@4509dd1Todd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-05-12 15:40:00openshift/operator-framework-operator-controller@ea2319aRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-05-12 15:40:01openshift/operator-framework-operator-controller@90bf024Rashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-05-12 15:40:01openshift/operator-framework-operator-controller@dbda18cRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-05-12 15:40:01openshift/operator-framework-operator-controller@d250815Rashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-05-12 15:40:02openshift/operator-framework-operator-controller@8310c66Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-05-12 15:40:02openshift/operator-framework-operator-controller@2cb2f0dBruno AndradeUPSTREAM: <carry>: update metadata
2026-05-12 15:40:03openshift/operator-framework-operator-controller@1ce2d9bBruno AndradeUPSTREAM: <carry>: remove originalName
2026-05-12 15:40:03openshift/operator-framework-operator-controller@2985abeJian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-05-12 15:40:04openshift/operator-framework-operator-controller@4252770Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-05-12 15:40:04openshift/operator-framework-operator-controller@1fc1251Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-05-12 15:40:05openshift/operator-framework-operator-controller@aa94ad3Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-05-12 15:40:05openshift/operator-framework-operator-controller@488ff87Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-05-12 15:40:06openshift/operator-framework-operator-controller@6f5129fKui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-05-12 15:40:06openshift/operator-framework-operator-controller@8d3a83bEvan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:07openshift/operator-framework-operator-controller@677717dEvan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-05-12 15:40:07openshift/operator-framework-operator-controller@768552aEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-05-12 15:40:08openshift/operator-framework-operator-controller@2166e5aEvan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-05-12 15:40:08openshift/operator-framework-operator-controller@6931ebdEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-05-12 15:40:09openshift/operator-framework-operator-controller@b14cd2dLuke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-05-12 15:40:09openshift/operator-framework-operator-controller@1f6e5a5Camila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-05-12 15:40:10openshift/operator-framework-operator-controller@bde5720Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-05-12 15:40:10openshift/operator-framework-operator-controller@a66546dXia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-05-12 15:40:11openshift/operator-framework-operator-controller@2470473Kui WangUPSTREAM: <carry>: upgrade version support case
2026-05-12 15:40:11openshift/operator-framework-operator-controller@ebb31e2Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-05-12 15:40:12openshift/operator-framework-operator-controller@e361b44Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-05-12 15:40:12openshift/operator-framework-operator-controller@c0732f4Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-05-12 15:40:13openshift/operator-framework-operator-controller@6298e08Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-05-12 15:40:14openshift/operator-framework-operator-controller@433cbecCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-05-12 15:40:14openshift/operator-framework-operator-controller@37a09d0Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@c3ca4e3Bruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@8d77f61Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-05-12 15:40:16openshift/operator-framework-operator-controller@7ed4699Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-05-12 15:40:16openshift/operator-framework-operator-controller@0e6a2e2Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-05-12 15:40:17openshift/operator-framework-operator-controller@fc2ef52Kui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-05-12 15:40:17openshift/operator-framework-operator-controller@6c29e8fCamila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-05-12 15:40:18openshift/operator-framework-operator-controller@f873be3Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-05-12 15:40:19openshift/operator-framework-operator-controller@dd369d2Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-05-12 15:40:19openshift/operator-framework-operator-controller@e7c8169Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-05-12 15:40:20openshift/operator-framework-operator-controller@baf92aaStephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-05-12 15:40:20openshift/operator-framework-operator-controller@0ef291fCamila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-05-12 15:40:21openshift/operator-framework-operator-controller@9f62842Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:21openshift/operator-framework-operator-controller@937fd30Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7d97b97Kui WangUPSTREAM: <carry>: deployment config cases
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7c56c64Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-05-12 15:40:23openshift/operator-framework-operator-controller@98307a0Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-05-12 15:40:23openshift/operator-framework-operator-controller@335ac58Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-05-12 15:40:24openshift/operator-framework-operator-controller@38c85ebXia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-05-12 15:40:24openshift/operator-framework-operator-controller@3f63102Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-05-12 15:40:25openshift/operator-framework-operator-controller@8ef69d2Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-05-12 15:40:25openshift/operator-framework-operator-controller@b2969e1Jian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-05-12 15:40:26openshift/operator-framework-operator-controller@6d9279dTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-05-12 15:40:26openshift/operator-framework-operator-controller@670055aCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-05-12 15:40:27openshift/operator-framework-operator-controller@26fa0dfCamila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-05-12 15:40:27openshift/operator-framework-operator-controller@aacb7eeBruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-05-12 15:40:28openshift/operator-framework-operator-controller@8819a16Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-05-12 15:40:28openshift/operator-framework-operator-controller@4ddf7c9Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-05-12 15:40:29openshift/operator-framework-operator-controller@4ffaefdKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-05-12 15:40:29openshift/operator-framework-operator-controller@64ab52eCamila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-05-12 15:40:30openshift/operator-framework-operator-controller@3c85566Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-05-12 15:40:30openshift/operator-framework-operator-controller@87e1240Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-05-12 15:40:31openshift/operator-framework-operator-controller@5ef8edaCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP
2026-05-12 15:40:31openshift/operator-framework-operator-controller@0a86725Camila MacedoUPSTREAM: <carry>: OTE - Make OTE local output easier to read
2026-05-12 15:40:32openshift/operator-framework-operator-controller@ac8e783Joe LanfordUPSTREAM: <carry>: remove dead e2e registry push job and related variables
2026-05-12 15:40:32openshift/operator-framework-operator-controller@517a14dTodd ShortUPSTREAM: <carry>: OCPBUGS-62517: Set replicas=1, PDB, and pod anti-affinity for HA topology
2026-05-12 15:40:33openshift/operator-framework-operator-controller@b2a6546Todd ShortUPSTREAM: <carry>: fix(test): drop blocking namespace-deletion wait between both-watch-modes scenarios

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.

/assign @openshift/openshift-team-operator-runtime

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.

@coderabbitai

coderabbitaiBot commented May 13, 2026

Copy link
Copy Markdown

Walkthrough

This PR updates e2e test infrastructure to support parallel and serial test execution modes, applies feature gate configuration changes across all deployment manifests, enhances Kubernetes integration testing infrastructure for the action package, updates dependencies, and expands documentation.

Changes

Serial/Parallel E2E Test Execution Framework

Layer / File(s)Summary
E2E target with conditional execution mode
Makefile
The e2e target now supports automatic parallel (~@Serial) and serial (@Serial) test phases when GODOG_ARGS is empty, with explicit exit-code handling and combined timeout. When GODOG_ARGS is provided, it runs a single custom invocation instead.
Serial test tagging and documentation
test/e2e/README.md, test/e2e/features/ha.feature, test/e2e/features/proxy.feature, test/e2e/features/revision.feature, test/e2e/features/tls.feature
Feature files are tagged with @Serial to enforce serial execution; documentation explains the tag purpose, GODOG_ARGS customization, and test-identifying annotations. A new proxy feature is added.
Scenario context enrichment and resource annotation
test/e2e/steps/hooks.go, test/e2e/steps/steps.go
Scenario context now includes featureName and scenarioName extracted from feature URIs. Applied resources are annotated with feature/scenario metadata for traceability.

Feature Gate Configuration Policy

Layer / File(s)Summary
Helm value configurations
helm/experimental.yaml, helm/olmv1/values.yaml
Helm values now explicitly define operator-controller feature gates (enabling WebhookProviderCertManager, disabling SyntheticPermissions and several others) and catalogd feature gates (disabling APIV1MetasHandler).
Standard Kubernetes manifests
manifests/standard.yaml, manifests/standard-e2e.yaml, manifests/experimental.yaml, manifests/experimental-e2e.yaml
Kubernetes Deployments for operator-controller and catalogd add or reorder --feature-gates arguments to match Helm configurations across both standard and experimental variants.
OpenShift variant manifests
openshift/catalogd/manifests.yaml, openshift/catalogd/manifests-experimental.yaml, openshift/operator-controller/manifests.yaml
OpenShift-specific manifests apply the same feature-gate configuration policy, with catalogd disabling APIV1MetasHandler and operator-controller enabling WebhookProviderCertManager while disabling others.

Kubernetes Integration Test Infrastructure

Layer / File(s)Summary
Test environment bootstrap
internal/operator-controller/action/action_test.go
TestMain initializes a Kubernetes test environment, starts it to obtain a REST config, runs the test suite, and cleanly shuts down with retry logic.
Chunked secrets storage driver config and tests
internal/operator-controller/action/storagedriver.go, internal/operator-controller/action/storagedriver_test.go
A shared chunkedSecretsConfig pinning chunk size and capacity limits is introduced; ChunkedStorageDriverMapper uses this config. New tests verify invariants (chunk sizing, capacity) and max-capacity round-trip behavior via the real storage driver against a Kubernetes Secrets client.

Dependency Updates

Layer / File(s)Summary
Go module version bumps
go.mod, openshift/tests-extension/go.mod
Direct dependencies (operator-registry, golang.org/x/mod, docker/cli, go-sqlite3, gomega) and indirect dependencies (OpenTelemetry, google.golang.org/grpc, and related transitive modules) are updated to newer versions across both root and OpenShift extension modules.

Documentation

Layer / File(s)Summary
Folder structure reference
AGENTS.md
Added inline note referencing test/e2e/README.md for e2e test documentation.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 7 | ❌ 5

❌ Failed checks (4 warnings, 1 inconclusive)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 15.38% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
Test Structure And Quality⚠️ Warningstoragedriver_test.go: Early test failures skip cleanup of created Secrets. Contradictory feature gates in openshift/catalogd/manifests-experimental.yaml (lines 854-855).Use t.Cleanup() after drv.Create() in storagedriver_test.go. Remove duplicate APIV1MetasHandler=true line 854.
Topology-Aware Scheduling Compatibility⚠️ WarningBase helm values use hard nodeSelector for control-plane (breaks HyperShift), hardcode replicas:1, lack pod anti-affinity, and set PDB minAvailable:1 without topology awareness.Implement topology detection for ControlPlaneTopology. Set replicas dynamically per topology. Use preferred pod anti-affinity. Avoid control-plane nodeSelectors. Test SNO/two-node/HyperShift topologies.
Ipv6 And Disconnected Network Test Compatibility⚠️ WarningNew e2e tests contain IPv4 assumptions incompatible with IPv6-only/disconnected CI: proxy.feature hardcodes 127.0.0.1:39999; randomAvailablePort() binds to hardcoded 127.0.0.1.Fix IPv4 in proxy.feature & randomAvailablePort(). Use ":0" for dual-stack binding. Add [Skipped:Disconnected] if needed. Run IPv6 job: periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-serial-ovn-ipv6
Title check❓ InconclusiveThe title references an upstream synchronization task but is overly broad and generic; it does not highlight the specific main changes like feature gates, test annotations, chunked storage updates, or dependency bumps.Consider a more specific title such as 'Enable feature gates and add test-identifying annotations for e2e tests' or 'Synchronize upstream: feature gates, chunked storage, and e2e test annotations' to better convey the primary changes.
✅ Passed checks (7 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names✅ PassedPR adds tests using standard Go testing and Godog/Gherkin BDD format, not Ginkgo. No Ginkgo test declarations (It, Describe, Context, When) found. Check not applicable to this PR.
Microshift Test Compatibility✅ PassedThis PR adds/updates Godog/Gherkin .feature files only. The custom check targets Ginkgo tests (It(), Describe(), Context(), When()), which are not present in this PR. The check is not applicable.
Single Node Openshift (Sno) Test Compatibility✅ PassedHA failover tests are protected via @CatalogdHA feature gate. BeforeSuite disables it on SNO (≤1 node), and CheckFeatureTags auto-skips scenarios with disabled gates. SNO compatibility is ensured.
Ote Binary Stdout Contract✅ PassedNo OTE Binary Stdout Contract violations. TestMain() uses log.Panic/utilruntime.Must (stderr), BeforeSuite() uses textlogger (stderr), OTE main.go unchanged.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 Trivy (0.69.3)

Trivy execution failed: 2026-05-13T19:23:08Z FATAL Fatal error run error: fs scan error: scan error: scan failed: failed analysis: post analysis error: post analysis error: ansible scan error: fs filter error: fs filter error: walk error range error: stat .coderabbit-opengrep-fallback.yml: no such file or directory: range error: stat .coderabbit-opengrep-fallback.yml: no such file or directory

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
openshift-ciBot requested review from joelanford and pedjakMay 13, 2026 19:22
@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

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@internal/operator-controller/action/storagedriver_test.go`:
- Around line 84-85: The test creates a resource with drv.Create(key, rel) but
only deletes it later, so if a require.* assertion fails before cleanup the
resource is leaked; immediately after calling drv.Create(key, rel) register a
t.Cleanup func that calls drv.Delete(key) (or ignores errors) so the resource is
removed regardless of test failures—i.e., add t.Cleanup(func(){ _ =
drv.Delete(key) }) right after the Create call (referencing drv.Create,
drv.Delete, key, rel, and t.Cleanup).
In `@openshift/catalogd/manifests-experimental.yaml`:
- Around line 854-855: There are contradictory duplicate args for the feature
gate (--feature-gates=APIV1MetasHandler=true and
--feature-gates=APIV1MetasHandler=false); remove one so the manifest only
contains a single --feature-gates=APIV1MetasHandler=<desired> entry (choose true
or false explicitly), and scan the same container/command args block to ensure
no other duplicate APIV1MetasHandler flags remain.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: f531e091-bc33-442d-a146-2753f99e415c

📥 Commits

Reviewing files that changed from the base of the PR and between 786e2f5 and 22dee16.

⛔ Files ignored due to path filters (99)
  • go.sum is excluded by !**/*.sum
  • openshift/tests-extension/go.sum is excluded by !**/*.sum
  • openshift/tests-extension/vendor/github.com/google/pprof/profile/profile.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/github.com/onsi/gomega/CHANGELOG.md is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/github.com/onsi/gomega/gomega_dsl.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform/attribute.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/version.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go is excluded by !**/*.pb.go, !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_windows.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/cpu/zcpu_windows.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/affinity_linux.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/mkall.sh is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/syscall_linux.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/syscall_linux_arm.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/unix/zsyscall_linux.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/windows/syscall_windows.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/windows/types_windows.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/golang.org/x/sys/windows/zsyscall_windows.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go is excluded by !**/*.pb.go, !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go is excluded by !**/*.pb.go, !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go is excluded by !**/*.pb.go, !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/clientconn.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/experimental/stats/metrics.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/envconfig/xds.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/mem/buffer_pool.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/resolver/config_selector.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/http2_client.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/http_util.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/readyreader/raw_conn_linux.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/readyreader/raw_conn_nonlinux.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/readyreader/ready_reader.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/internal/transport/transport.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/mem/buffer_slice.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/mem/buffers.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/stream.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/google.golang.org/grpc/version.go is excluded by !**/vendor/**
  • openshift/tests-extension/vendor/modules.txt is excluded by !**/vendor/**
  • vendor/github.com/mattn/go-sqlite3/README.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mattn/go-sqlite3/SECURITY.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mattn/go-sqlite3/sqlite3-binding.c is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mattn/go-sqlite3/sqlite3-binding.h is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mattn/go-sqlite3/sqlite3.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mattn/go-sqlite3/sqlite3ext.h is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-registry/alpha/declcfg/declcfg.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-registry/alpha/declcfg/declcfg_to_model.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-registry/alpha/declcfg/write.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-registry/alpha/model/versionrelease.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-registry/pkg/registry/parse.go is excluded by !**/vendor/**, !vendor/**
  • vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform/attribute.go is excluded by !**/vendor/**, !vendor/**
  • vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/version.go is excluded by !**/vendor/**, !vendor/**
  • vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/cpu/cpu_other_arm64.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/cpu/cpu_windows.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/cpu/zcpu_windows.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/affinity_linux.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/mkall.sh is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/syscall_linux.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/syscall_linux_arm.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/syscall_linux_arm64.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/syscall_linux_loong64.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/unix/zsyscall_linux.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/windows/syscall_windows.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/windows/types_windows.go is excluded by !**/vendor/**, !vendor/**
  • vendor/golang.org/x/sys/windows/zsyscall_windows.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/field_info.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/annotations/routing.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go is excluded by !**/*.pb.go, !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/clientconn.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/experimental/stats/metrics.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/envconfig/envconfig.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/envconfig/xds.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/mem/buffer_pool.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/resolver/config_selector.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/http2_client.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/http_util.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/readyreader/raw_conn_linux.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/readyreader/raw_conn_nonlinux.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/readyreader/ready_reader.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/internal/transport/transport.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/mem/buffer_slice.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/mem/buffers.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/stream.go is excluded by !**/vendor/**, !vendor/**
  • vendor/google.golang.org/grpc/version.go is excluded by !**/vendor/**, !vendor/**
  • vendor/modules.txt is excluded by !**/vendor/**, !vendor/**
📒 Files selected for processing (23)
  • AGENTS.md
  • Makefile
  • go.mod
  • helm/experimental.yaml
  • helm/olmv1/values.yaml
  • internal/operator-controller/action/action_test.go
  • internal/operator-controller/action/storagedriver.go
  • internal/operator-controller/action/storagedriver_test.go
  • manifests/experimental-e2e.yaml
  • manifests/experimental.yaml
  • manifests/standard-e2e.yaml
  • manifests/standard.yaml
  • openshift/catalogd/manifests-experimental.yaml
  • openshift/catalogd/manifests.yaml
  • openshift/operator-controller/manifests.yaml
  • openshift/tests-extension/go.mod
  • test/e2e/README.md
  • test/e2e/features/ha.feature
  • test/e2e/features/proxy.feature
  • test/e2e/features/revision.feature
  • test/e2e/features/tls.feature
  • test/e2e/steps/hooks.go
  • test/e2e/steps/steps.go

Comment on lines +84 to +85
require.NoError(t, drv.Create(key, rel))

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Ensure cleanup is guaranteed on early test failures.

Resources created at Line 84 are only deleted at Lines 131-132. If a require.* fails first, cleanup is skipped. Register deletion with t.Cleanup right after create.

Suggested fix
 key := fmt.Sprintf("sh.helm.release.v1.%s.v%d", rel.Name, rel.Version)
require.NoError(t, drv.Create(key, rel))
+ t.Cleanup(func() {+ _, _ = drv.Delete(key)+ })
@@
- _, err = drv.Delete(key)- require.NoError(t, err)

Also applies to: 131-132

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@internal/operator-controller/action/storagedriver_test.go` around lines 84 -
85, The test creates a resource with drv.Create(key, rel) but only deletes it
later, so if a require.* assertion fails before cleanup the resource is leaked;
immediately after calling drv.Create(key, rel) register a t.Cleanup func that
calls drv.Delete(key) (or ignores errors) so the resource is removed regardless
of test failures—i.e., add t.Cleanup(func(){ _ = drv.Delete(key) }) right after
the Create call (referencing drv.Create, drv.Delete, key, rel, and t.Cleanup).

Comment on lines 854 to +855
- --feature-gates=APIV1MetasHandler=true
- --feature-gates=APIV1MetasHandler=false

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Remove contradictory duplicate feature-gate args.

Line 854 enables APIV1MetasHandler while Line 855 disables it. Keeping both is ambiguous and risks unintended gate state.

Suggested fix
- - --feature-gates=APIV1MetasHandler=true
- --feature-gates=APIV1MetasHandler=false
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- --feature-gates=APIV1MetasHandler=true
- --feature-gates=APIV1MetasHandler=false
- --feature-gates=APIV1MetasHandler=false
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@openshift/catalogd/manifests-experimental.yaml` around lines 854 - 855, There
are contradictory duplicate args for the feature gate
(--feature-gates=APIV1MetasHandler=true and
--feature-gates=APIV1MetasHandler=false); remove one so the manifest only
contains a single --feature-gates=APIV1MetasHandler=<desired> entry (choose true
or false explicitly), and scan the same container/command args block to ensure
no other duplicate APIV1MetasHandler flags remain.

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

@tmshort

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robotopenshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 14, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-85508, which is valid. The bug has been moved to the POST state.

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

In response to this:

/jira refresh

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.

@tmshort

tmshort commented May 14, 2026

Copy link
Copy Markdown
Contributor

/verified by ci/prow/e2e-aws-olmv1-ext

Rationale: 5 upstream commits; all CI jobs pass.

  • f120442 (joelanford): Bug fix — reduces ChunkSize to fit Kubernetes 1MB Secret limit; new upstream unit + integration tests added; covered by ci/prow/unit and e2e-aws-olmv1-ext.
  • f691ffe (grokspawn): Pure Go dep bump (operator-registry); go.mod/go.sum only.
  • 0d6fcd2 (pedjak): Test-only — adds test-identifying annotations to e2e resources; no production code.
  • ea60813 (dtfranz): Build/test infra — enables concurrent e2e execution; Makefile + feature files only.
  • c02fe46 (pedjak): Manifest config — makes all feature gates explicit in standard and experimental deployments; covered by e2e-aws-olmv1-ext and e2e-aws-techpreview-olmv1-ext.

🤖 Generated by Claude Code

CI passes, the Manifest config is regenerated by cluster-olm-operator.

@openshift-ci-robotopenshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 14, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: This PR has been marked as verified by ci/prow/e2e-aws-olmv1-ext.

Details

In response to this:

/verified by ci/prow/e2e-aws-olmv1-ext

Rationale: 5 upstream commits; all CI jobs pass.

  • f120442 (joelanford): Bug fix — reduces ChunkSize to fit Kubernetes 1MB Secret limit; new upstream unit + integration tests added; covered by ci/prow/unit and e2e-aws-olmv1-ext.
  • f691ffe (grokspawn): Pure Go dep bump (operator-registry); go.mod/go.sum only.
  • 0d6fcd2 (pedjak): Test-only — adds test-identifying annotations to e2e resources; no production code.
  • ea60813 (dtfranz): Build/test infra — enables concurrent e2e execution; Makefile + feature files only.
  • c02fe46 (pedjak): Manifest config — makes all feature gates explicit in standard and experimental deployments; covered by e2e-aws-olmv1-ext and e2e-aws-techpreview-olmv1-ext.

🤖 Generated by Claude Code

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-merge-bot
openshift-merge-botBot merged commit 1675d19 into openshift:mainMay 14, 2026
16 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

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

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

Details

In response to this:

JIRA Tickets:

  • OCPBUGS-85508

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

DateCommitAuthorMessage
2026-05-13 19:09:05operator-framework/operator-controller@f120442Joe Lanfordfix: reduce chunked storage ChunkSize to fit within Kubernetes Secret limit (#2702)
2026-05-13 18:41:35operator-framework/operator-controller@f691ffeJordan Keisterbump op-reg (#2703)
2026-05-13 16:32:51operator-framework/operator-controller@0d6fcd2Predrag KnezevicAdd test-identifying annotations to e2e resources (#2701)
2026-05-13 16:21:47operator-framework/operator-controller@ea60813Daniel FranzConcurrent Test Execution (#2675)
2026-05-13 15:19:28operator-framework/operator-controller@c02fe46Predrag KnezevicPass all feature gates explicitly in controller deployments (#2700)

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

DateCommitAuthorMessage
2026-05-12 15:39:45openshift/operator-framework-operator-controller@4262df3dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-05-12 15:39:46openshift/operator-framework-operator-controller@a023f75Camila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-05-12 15:39:46openshift/operator-framework-operator-controller@e831cf7Camila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-05-12 15:39:47openshift/operator-framework-operator-controller@455259dCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-05-12 15:39:47openshift/operator-framework-operator-controller@52514a8Todd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-05-12 15:39:48openshift/operator-framework-operator-controller@7924fc1Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-05-12 15:39:49openshift/operator-framework-operator-controller@417374fKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-05-12 15:39:49openshift/operator-framework-operator-controller@bc15625Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-05-12 15:39:50openshift/operator-framework-operator-controller@cdcad4dTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-05-12 15:39:50openshift/operator-framework-operator-controller@33ec00cCamila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-05-12 15:39:51openshift/operator-framework-operator-controller@53fd9a1Camila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-05-12 15:39:51openshift/operator-framework-operator-controller@ca5db7bKui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-05-12 15:39:52openshift/operator-framework-operator-controller@fc953aeCamila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-05-12 15:39:52openshift/operator-framework-operator-controller@f8c86afKui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-05-12 15:39:54openshift/operator-framework-operator-controller@ca23ba9Camila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-05-12 15:39:54openshift/operator-framework-operator-controller@515dfefCamila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-05-12 15:39:55openshift/operator-framework-operator-controller@f421f3cCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-05-12 15:39:56openshift/operator-framework-operator-controller@1361c9bKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-05-12 15:39:57openshift/operator-framework-operator-controller@230e956Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-05-12 15:39:57openshift/operator-framework-operator-controller@616f13bXia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2493db0Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-05-12 15:39:58openshift/operator-framework-operator-controller@2861d7aTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-05-12 15:39:59openshift/operator-framework-operator-controller@1d88a69Xia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-05-12 15:39:59openshift/operator-framework-operator-controller@9e12a8fKui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-05-12 15:40:00openshift/operator-framework-operator-controller@4509dd1Todd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-05-12 15:40:00openshift/operator-framework-operator-controller@ea2319aRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-05-12 15:40:01openshift/operator-framework-operator-controller@90bf024Rashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-05-12 15:40:01openshift/operator-framework-operator-controller@dbda18cRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-05-12 15:40:01openshift/operator-framework-operator-controller@d250815Rashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-05-12 15:40:02openshift/operator-framework-operator-controller@8310c66Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-05-12 15:40:02openshift/operator-framework-operator-controller@2cb2f0dBruno AndradeUPSTREAM: <carry>: update metadata
2026-05-12 15:40:03openshift/operator-framework-operator-controller@1ce2d9bBruno AndradeUPSTREAM: <carry>: remove originalName
2026-05-12 15:40:03openshift/operator-framework-operator-controller@2985abeJian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-05-12 15:40:04openshift/operator-framework-operator-controller@4252770Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-05-12 15:40:04openshift/operator-framework-operator-controller@1fc1251Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-05-12 15:40:05openshift/operator-framework-operator-controller@aa94ad3Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-05-12 15:40:05openshift/operator-framework-operator-controller@488ff87Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-05-12 15:40:06openshift/operator-framework-operator-controller@6f5129fKui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-05-12 15:40:06openshift/operator-framework-operator-controller@8d3a83bEvan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:07openshift/operator-framework-operator-controller@677717dEvan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-05-12 15:40:07openshift/operator-framework-operator-controller@768552aEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-05-12 15:40:08openshift/operator-framework-operator-controller@2166e5aEvan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-05-12 15:40:08openshift/operator-framework-operator-controller@6931ebdEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-05-12 15:40:09openshift/operator-framework-operator-controller@b14cd2dLuke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-05-12 15:40:09openshift/operator-framework-operator-controller@1f6e5a5Camila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-05-12 15:40:10openshift/operator-framework-operator-controller@bde5720Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-05-12 15:40:10openshift/operator-framework-operator-controller@a66546dXia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-05-12 15:40:11openshift/operator-framework-operator-controller@2470473Kui WangUPSTREAM: <carry>: upgrade version support case
2026-05-12 15:40:11openshift/operator-framework-operator-controller@ebb31e2Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-05-12 15:40:12openshift/operator-framework-operator-controller@e361b44Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-05-12 15:40:12openshift/operator-framework-operator-controller@c0732f4Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-05-12 15:40:13openshift/operator-framework-operator-controller@6298e08Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-05-12 15:40:14openshift/operator-framework-operator-controller@433cbecCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-05-12 15:40:14openshift/operator-framework-operator-controller@37a09d0Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@c3ca4e3Bruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-05-12 15:40:15openshift/operator-framework-operator-controller@8d77f61Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-05-12 15:40:16openshift/operator-framework-operator-controller@7ed4699Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-05-12 15:40:16openshift/operator-framework-operator-controller@0e6a2e2Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-05-12 15:40:17openshift/operator-framework-operator-controller@fc2ef52Kui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-05-12 15:40:17openshift/operator-framework-operator-controller@6c29e8fCamila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-05-12 15:40:18openshift/operator-framework-operator-controller@f873be3Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-05-12 15:40:19openshift/operator-framework-operator-controller@dd369d2Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-05-12 15:40:19openshift/operator-framework-operator-controller@e7c8169Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-05-12 15:40:20openshift/operator-framework-operator-controller@baf92aaStephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-05-12 15:40:20openshift/operator-framework-operator-controller@0ef291fCamila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-05-12 15:40:21openshift/operator-framework-operator-controller@9f62842Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-05-12 15:40:21openshift/operator-framework-operator-controller@937fd30Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7d97b97Kui WangUPSTREAM: <carry>: deployment config cases
2026-05-12 15:40:22openshift/operator-framework-operator-controller@7c56c64Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-05-12 15:40:23openshift/operator-framework-operator-controller@98307a0Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-05-12 15:40:23openshift/operator-framework-operator-controller@335ac58Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-05-12 15:40:24openshift/operator-framework-operator-controller@38c85ebXia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-05-12 15:40:24openshift/operator-framework-operator-controller@3f63102Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-05-12 15:40:25openshift/operator-framework-operator-controller@8ef69d2Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-05-12 15:40:25openshift/operator-framework-operator-controller@b2969e1Jian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-05-12 15:40:26openshift/operator-framework-operator-controller@6d9279dTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-05-12 15:40:26openshift/operator-framework-operator-controller@670055aCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-05-12 15:40:27openshift/operator-framework-operator-controller@26fa0dfCamila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-05-12 15:40:27openshift/operator-framework-operator-controller@aacb7eeBruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-05-12 15:40:28openshift/operator-framework-operator-controller@8819a16Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-05-12 15:40:28openshift/operator-framework-operator-controller@4ddf7c9Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-05-12 15:40:29openshift/operator-framework-operator-controller@4ffaefdKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-05-12 15:40:29openshift/operator-framework-operator-controller@64ab52eCamila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-05-12 15:40:30openshift/operator-framework-operator-controller@3c85566Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-05-12 15:40:30openshift/operator-framework-operator-controller@87e1240Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-05-12 15:40:31openshift/operator-framework-operator-controller@5ef8edaCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP
2026-05-12 15:40:31openshift/operator-framework-operator-controller@0a86725Camila MacedoUPSTREAM: <carry>: OTE - Make OTE local output easier to read
2026-05-12 15:40:32openshift/operator-framework-operator-controller@ac8e783Joe LanfordUPSTREAM: <carry>: remove dead e2e registry push job and related variables
2026-05-12 15:40:32openshift/operator-framework-operator-controller@517a14dTodd ShortUPSTREAM: <carry>: OCPBUGS-62517: Set replicas=1, PDB, and pod anti-affinity for HA topology
2026-05-12 15:40:33openshift/operator-framework-operator-controller@b2a6546Todd ShortUPSTREAM: <carry>: fix(test): drop blocking namespace-deletion wait between both-watch-modes scenarios

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.

/assign @openshift/openshift-team-operator-runtime

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-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 5.0.0-0.nightly-2026-05-14-220455

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-bugIndicates that a referenced Jira bug is valid for the branch this PR is targeting.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.

19 participants

@openshift-bot@openshift-ci-robot@tmshort@openshift-merge-robot@pedjak@dtfranz@grokspawn@joelanford@camilamacedo86@kuiwang02@jianzhangbjz@Xia-Zhao-rh@rashmigottipati@bandrade@oceanc80@ehearne-redhat@sosiouxme@stbenjam@fgiudici