Skip to content

NO-ISSUE: Synchronize From Upstream Repositories - #706

Merged
openshift-merge-bot[bot] merged 91 commits into
openshift:mainfrom
openshift-bot:synchronize-upstream
Apr 23, 2026
Merged

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

Conversation

@openshift-bot

@openshift-botopenshift-bot commented Apr 22, 2026

Copy link
Copy Markdown

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

DateCommitAuthorMessage
2026-04-22 06:18:36operator-framework/operator-controller@c92a607dependabot[bot]🌱 Bump lxml from 6.0.2 to 6.1.0 (#2667)

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

DateCommitAuthorMessage
2026-04-21 16:52:12openshift/operator-framework-operator-controller@4aba9a8dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-04-21 16:52:14openshift/operator-framework-operator-controller@6b30b3eCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-04-21 16:52:15openshift/operator-framework-operator-controller@8a5e73fCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-04-21 16:52:16openshift/operator-framework-operator-controller@836aeaeCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-04-21 16:52:17openshift/operator-framework-operator-controller@3c29f8bTodd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-04-21 16:52:18openshift/operator-framework-operator-controller@96c4641Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-04-21 16:52:19openshift/operator-framework-operator-controller@d81f1aeKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-04-21 16:52:20openshift/operator-framework-operator-controller@ea23980Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-04-21 16:52:22openshift/operator-framework-operator-controller@ef3546aTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-04-21 16:52:23openshift/operator-framework-operator-controller@2d643b2Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-04-21 16:52:24openshift/operator-framework-operator-controller@89ee27bCamila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-04-21 16:52:25openshift/operator-framework-operator-controller@9051360Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-04-21 16:52:26openshift/operator-framework-operator-controller@521bc03Camila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-04-21 16:52:27openshift/operator-framework-operator-controller@900fdb2Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-04-21 16:52:29openshift/operator-framework-operator-controller@f30a48cCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-04-21 16:52:30openshift/operator-framework-operator-controller@a4b1ab2Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-04-21 16:52:32openshift/operator-framework-operator-controller@7edc277Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-04-21 16:52:33openshift/operator-framework-operator-controller@070bdecKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-04-21 16:52:34openshift/operator-framework-operator-controller@a647ca4Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-04-21 16:52:34openshift/operator-framework-operator-controller@b144b56Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-04-21 16:52:35openshift/operator-framework-operator-controller@0c0a025Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-04-21 16:52:36openshift/operator-framework-operator-controller@04103cbTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-04-21 16:52:37openshift/operator-framework-operator-controller@75d8acfXia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-04-21 16:52:38openshift/operator-framework-operator-controller@dd577f9Kui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-04-21 16:52:39openshift/operator-framework-operator-controller@3d0464dTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-04-21 16:52:40openshift/operator-framework-operator-controller@0a5548bRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-04-21 16:52:41openshift/operator-framework-operator-controller@956599eRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-04-21 16:52:42openshift/operator-framework-operator-controller@ff9d8feRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-04-21 16:52:43openshift/operator-framework-operator-controller@f7a33fbRashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-04-21 16:52:44openshift/operator-framework-operator-controller@71c96d2Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f41bb2cBruno AndradeUPSTREAM: <carry>: update metadata
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f6ce1f6Bruno AndradeUPSTREAM: <carry>: remove originalName
2026-04-21 16:52:46openshift/operator-framework-operator-controller@3015a66Jian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-04-21 16:52:47openshift/operator-framework-operator-controller@7d04832Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-04-21 16:52:48openshift/operator-framework-operator-controller@56fb855Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-04-21 16:52:49openshift/operator-framework-operator-controller@d8f66c6Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-04-21 16:52:50openshift/operator-framework-operator-controller@46a0123Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-04-21 16:52:51openshift/operator-framework-operator-controller@f8d4b18Kui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-04-21 16:52:51openshift/operator-framework-operator-controller@a712c37Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:52:52openshift/operator-framework-operator-controller@43ad2c4Evan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-04-21 16:52:53openshift/operator-framework-operator-controller@a7d0f3cEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-04-21 16:52:54openshift/operator-framework-operator-controller@4eaa560Evan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-04-21 16:52:55openshift/operator-framework-operator-controller@cd2671eEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-04-21 16:52:56openshift/operator-framework-operator-controller@33920c3Luke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-04-21 16:52:57openshift/operator-framework-operator-controller@2f0ce9bCamila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-04-21 16:52:58openshift/operator-framework-operator-controller@76b1e16Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-04-21 16:52:59openshift/operator-framework-operator-controller@d07a776Xia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-04-21 16:53:00openshift/operator-framework-operator-controller@489ce79Kui WangUPSTREAM: <carry>: upgrade version support case
2026-04-21 16:53:01openshift/operator-framework-operator-controller@4bed2e4Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-04-21 16:53:02openshift/operator-framework-operator-controller@a9f06e7Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-04-21 16:53:03openshift/operator-framework-operator-controller@b1b7948Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-04-21 16:53:04openshift/operator-framework-operator-controller@efaf764Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-04-21 16:53:06openshift/operator-framework-operator-controller@ae14f8eCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-04-21 16:53:07openshift/operator-framework-operator-controller@3d327e5Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-04-21 16:53:08openshift/operator-framework-operator-controller@aaec10eBruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-04-21 16:53:09openshift/operator-framework-operator-controller@05bbdc9Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-04-21 16:53:10openshift/operator-framework-operator-controller@0c8c7b0Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-04-21 16:53:11openshift/operator-framework-operator-controller@9b45d89Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-04-21 16:53:12openshift/operator-framework-operator-controller@43c811aKui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-04-21 16:53:13openshift/operator-framework-operator-controller@a066545Camila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-04-21 16:53:14openshift/operator-framework-operator-controller@b774175Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-04-21 16:53:16openshift/operator-framework-operator-controller@58fa7a7Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-04-21 16:53:17openshift/operator-framework-operator-controller@e04d539Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-04-21 16:53:17openshift/operator-framework-operator-controller@38149d7Stephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-04-21 16:53:18openshift/operator-framework-operator-controller@d61bb52Camila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-04-21 16:53:19openshift/operator-framework-operator-controller@8058aa1Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:53:20openshift/operator-framework-operator-controller@d103627Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-04-21 16:53:21openshift/operator-framework-operator-controller@549b7baKui WangUPSTREAM: <carry>: deployment config cases
2026-04-21 16:53:21openshift/operator-framework-operator-controller@5d7f763Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-04-21 16:53:22openshift/operator-framework-operator-controller@afce0c8Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-04-21 16:53:23openshift/operator-framework-operator-controller@0524e03Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-04-21 16:53:24openshift/operator-framework-operator-controller@3d8fa30Xia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-04-21 16:53:25openshift/operator-framework-operator-controller@d296ff2Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-04-21 16:53:25openshift/operator-framework-operator-controller@2a41354Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-04-21 16:53:26openshift/operator-framework-operator-controller@d6091ebJian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-04-21 16:53:27openshift/operator-framework-operator-controller@91c36fcTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-04-21 16:53:28openshift/operator-framework-operator-controller@4abc1edCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-04-21 16:53:29openshift/operator-framework-operator-controller@7474ca3Camila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-04-21 16:53:30openshift/operator-framework-operator-controller@b5ef4b1Bruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-04-21 16:53:31openshift/operator-framework-operator-controller@4235fe4Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-04-21 16:53:31openshift/operator-framework-operator-controller@a599379Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-04-21 16:53:32openshift/operator-framework-operator-controller@c97b9dfKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-04-21 16:53:33openshift/operator-framework-operator-controller@73fbd53Camila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-04-21 16:53:34openshift/operator-framework-operator-controller@ecfaa13Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-04-21 16:53:35openshift/operator-framework-operator-controller@da7fd95Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-04-21 16:53:35openshift/operator-framework-operator-controller@b15cc7aCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

dependabotBotand others added 30 commits April 22, 2026 06:18
Bumps [lxml](https://github.com/lxml/lxml) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-6.0.2...lxml-6.1.0)
---
updated-dependencies:
- dependency-name: lxml
dependency-version: 6.1.0
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>
camilamacedo86and others added 13 commits April 22, 2026 13:53
…t in OTE tests
Update all remaining references to ClusterExtensionRevision in
openshift/tests-extension to use ClusterObjectSet, matching the
upstream rename in operator-framework/operator-controller#2589.
Files updated:
- test/qe/specs/olmv1_ce.go: RBAC resource names and comments
- test/olmv1-preflight.go: scenario constants, test names, RBAC rules
- .openshift-tests-extension/openshift_payload_olmv1.json: test name
- pkg/bindata/qe/bindata.go: embedded RBAC templates
- test/qe/testdata/olm/sa-nginx-limited-boxcutter.yaml: RBAC resources
- test/qe/testdata/olm/sa-nginx-insufficient-operand-rbac-boxcutter.yaml: RBAC resources
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
Made-with: Cursor
…s ClusterObjectSet
The upstream rename of ClusterExtensionRevision to ClusterObjectSet
(operator-framework/operator-controller#2589) breaks the incompatible
operator detection in cluster-olm-operator. The cluster-olm-operator
binary still reads ClusterExtensionRevision resources to find operators
with olm.maxOpenShiftVersion, so after the rename it never detects
incompatible operators and InstalledOLMOperatorsUpgradeable stays True.
Skip this test when NewOLMBoxCutterRuntime feature gate is enabled
until cluster-olm-operator is updated to read ClusterObjectSet.
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
Made-with: Cursor
Signed-off-by: Francesco Giudici <fgiudici@redhat.com>
Signed-off-by: Todd Short <todd.short@me.com>
@openshift-ci-robotopenshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

Details

In response to this:

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

DateCommitAuthorMessage
2026-04-22 06:18:36operator-framework/operator-controller@c92a607dependabot[bot]🌱 Bump lxml from 6.0.2 to 6.1.0 (#2667)

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

DateCommitAuthorMessage
2026-04-21 16:52:12openshift/operator-framework-operator-controller@4aba9a8dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-04-21 16:52:14openshift/operator-framework-operator-controller@6b30b3eCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-04-21 16:52:15openshift/operator-framework-operator-controller@8a5e73fCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-04-21 16:52:16openshift/operator-framework-operator-controller@836aeaeCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-04-21 16:52:17openshift/operator-framework-operator-controller@3c29f8bTodd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-04-21 16:52:18openshift/operator-framework-operator-controller@96c4641Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-04-21 16:52:19openshift/operator-framework-operator-controller@d81f1aeKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-04-21 16:52:20openshift/operator-framework-operator-controller@ea23980Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-04-21 16:52:22openshift/operator-framework-operator-controller@ef3546aTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-04-21 16:52:23openshift/operator-framework-operator-controller@2d643b2Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-04-21 16:52:24openshift/operator-framework-operator-controller@89ee27bCamila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-04-21 16:52:25openshift/operator-framework-operator-controller@9051360Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-04-21 16:52:26openshift/operator-framework-operator-controller@521bc03Camila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-04-21 16:52:27openshift/operator-framework-operator-controller@900fdb2Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-04-21 16:52:29openshift/operator-framework-operator-controller@f30a48cCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-04-21 16:52:30openshift/operator-framework-operator-controller@a4b1ab2Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-04-21 16:52:32openshift/operator-framework-operator-controller@7edc277Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-04-21 16:52:33openshift/operator-framework-operator-controller@070bdecKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-04-21 16:52:34openshift/operator-framework-operator-controller@a647ca4Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-04-21 16:52:34openshift/operator-framework-operator-controller@b144b56Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-04-21 16:52:35openshift/operator-framework-operator-controller@0c0a025Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-04-21 16:52:36openshift/operator-framework-operator-controller@04103cbTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-04-21 16:52:37openshift/operator-framework-operator-controller@75d8acfXia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-04-21 16:52:38openshift/operator-framework-operator-controller@dd577f9Kui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-04-21 16:52:39openshift/operator-framework-operator-controller@3d0464dTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-04-21 16:52:40openshift/operator-framework-operator-controller@0a5548bRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-04-21 16:52:41openshift/operator-framework-operator-controller@956599eRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-04-21 16:52:42openshift/operator-framework-operator-controller@ff9d8feRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-04-21 16:52:43openshift/operator-framework-operator-controller@f7a33fbRashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-04-21 16:52:44openshift/operator-framework-operator-controller@71c96d2Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f41bb2cBruno AndradeUPSTREAM: <carry>: update metadata
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f6ce1f6Bruno AndradeUPSTREAM: <carry>: remove originalName
2026-04-21 16:52:46openshift/operator-framework-operator-controller@3015a66Jian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-04-21 16:52:47openshift/operator-framework-operator-controller@7d04832Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-04-21 16:52:48openshift/operator-framework-operator-controller@56fb855Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-04-21 16:52:49openshift/operator-framework-operator-controller@d8f66c6Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-04-21 16:52:50openshift/operator-framework-operator-controller@46a0123Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-04-21 16:52:51openshift/operator-framework-operator-controller@f8d4b18Kui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-04-21 16:52:51openshift/operator-framework-operator-controller@a712c37Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:52:52openshift/operator-framework-operator-controller@43ad2c4Evan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-04-21 16:52:53openshift/operator-framework-operator-controller@a7d0f3cEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-04-21 16:52:54openshift/operator-framework-operator-controller@4eaa560Evan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-04-21 16:52:55openshift/operator-framework-operator-controller@cd2671eEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-04-21 16:52:56openshift/operator-framework-operator-controller@33920c3Luke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-04-21 16:52:57openshift/operator-framework-operator-controller@2f0ce9bCamila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-04-21 16:52:58openshift/operator-framework-operator-controller@76b1e16Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-04-21 16:52:59openshift/operator-framework-operator-controller@d07a776Xia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-04-21 16:53:00openshift/operator-framework-operator-controller@489ce79Kui WangUPSTREAM: <carry>: upgrade version support case
2026-04-21 16:53:01openshift/operator-framework-operator-controller@4bed2e4Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-04-21 16:53:02openshift/operator-framework-operator-controller@a9f06e7Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-04-21 16:53:03openshift/operator-framework-operator-controller@b1b7948Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-04-21 16:53:04openshift/operator-framework-operator-controller@efaf764Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-04-21 16:53:06openshift/operator-framework-operator-controller@ae14f8eCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-04-21 16:53:07openshift/operator-framework-operator-controller@3d327e5Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-04-21 16:53:08openshift/operator-framework-operator-controller@aaec10eBruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-04-21 16:53:09openshift/operator-framework-operator-controller@05bbdc9Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-04-21 16:53:10openshift/operator-framework-operator-controller@0c8c7b0Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-04-21 16:53:11openshift/operator-framework-operator-controller@9b45d89Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-04-21 16:53:12openshift/operator-framework-operator-controller@43c811aKui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-04-21 16:53:13openshift/operator-framework-operator-controller@a066545Camila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-04-21 16:53:14openshift/operator-framework-operator-controller@b774175Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-04-21 16:53:16openshift/operator-framework-operator-controller@58fa7a7Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-04-21 16:53:17openshift/operator-framework-operator-controller@e04d539Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-04-21 16:53:17openshift/operator-framework-operator-controller@38149d7Stephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-04-21 16:53:18openshift/operator-framework-operator-controller@d61bb52Camila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-04-21 16:53:19openshift/operator-framework-operator-controller@8058aa1Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:53:20openshift/operator-framework-operator-controller@d103627Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-04-21 16:53:21openshift/operator-framework-operator-controller@549b7baKui WangUPSTREAM: <carry>: deployment config cases
2026-04-21 16:53:21openshift/operator-framework-operator-controller@5d7f763Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-04-21 16:53:22openshift/operator-framework-operator-controller@afce0c8Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-04-21 16:53:23openshift/operator-framework-operator-controller@0524e03Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-04-21 16:53:24openshift/operator-framework-operator-controller@3d8fa30Xia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-04-21 16:53:25openshift/operator-framework-operator-controller@d296ff2Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-04-21 16:53:25openshift/operator-framework-operator-controller@2a41354Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-04-21 16:53:26openshift/operator-framework-operator-controller@d6091ebJian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-04-21 16:53:27openshift/operator-framework-operator-controller@91c36fcTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-04-21 16:53:28openshift/operator-framework-operator-controller@4abc1edCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-04-21 16:53:29openshift/operator-framework-operator-controller@7474ca3Camila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-04-21 16:53:30openshift/operator-framework-operator-controller@b5ef4b1Bruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-04-21 16:53:31openshift/operator-framework-operator-controller@4235fe4Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-04-21 16:53:31openshift/operator-framework-operator-controller@a599379Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-04-21 16:53:32openshift/operator-framework-operator-controller@c97b9dfKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-04-21 16:53:33openshift/operator-framework-operator-controller@73fbd53Camila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-04-21 16:53:34openshift/operator-framework-operator-controller@ecfaa13Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-04-21 16:53:35openshift/operator-framework-operator-controller@da7fd95Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-04-21 16:53:35openshift/operator-framework-operator-controller@b15cc7aCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-botopenshift-bot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. kind/sync labels Apr 22, 2026
@openshift-ci

Copy link
Copy Markdown
Contributor

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

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

DateCommitAuthorMessage
2026-04-22 06:18:36operator-framework/operator-controller@c92a607dependabot[bot]🌱 Bump lxml from 6.0.2 to 6.1.0 (#2667)

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

DateCommitAuthorMessage
2026-04-21 16:52:12openshift/operator-framework-operator-controller@4aba9a8dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2026-04-21 16:52:14openshift/operator-framework-operator-controller@6b30b3eCamila MacedoUPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2026-04-21 16:52:15openshift/operator-framework-operator-controller@8a5e73fCamila MacedoUPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2026-04-21 16:52:16openshift/operator-framework-operator-controller@836aeaeCamila MacedoUPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2026-04-21 16:52:17openshift/operator-framework-operator-controller@3c29f8bTodd ShortUPSTREAM: <carry>: Update OCP catalogs to v4.21
2026-04-21 16:52:18openshift/operator-framework-operator-controller@96c4641Kui WangUPSTREAM: <carry>: support singleown cases in disconnected
2026-04-21 16:52:19openshift/operator-framework-operator-controller@d81f1aeKui WangUPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2026-04-21 16:52:20openshift/operator-framework-operator-controller@ea23980Camila MacedoUPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2026-04-21 16:52:22openshift/operator-framework-operator-controller@ef3546aTodd ShortUPSTREAM: <carry>: Update to new feature-gate options in helm
2026-04-21 16:52:23openshift/operator-framework-operator-controller@2d643b2Camila MacedoUPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2026-04-21 16:52:24openshift/operator-framework-operator-controller@89ee27bCamila MacedoUPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2026-04-21 16:52:25openshift/operator-framework-operator-controller@9051360Kui WangUPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2026-04-21 16:52:26openshift/operator-framework-operator-controller@521bc03Camila MacedoUPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2026-04-21 16:52:27openshift/operator-framework-operator-controller@900fdb2Kui WangUPSTREAM: <carry>: Add [OTP] to migrated cases
2026-04-21 16:52:29openshift/operator-framework-operator-controller@f30a48cCamila MacedoUPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2026-04-21 16:52:30openshift/operator-framework-operator-controller@a4b1ab2Camila MacedoUPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format
2026-04-21 16:52:32openshift/operator-framework-operator-controller@7edc277Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
2026-04-21 16:52:33openshift/operator-framework-operator-controller@070bdecKui WangUPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases
2026-04-21 16:52:34openshift/operator-framework-operator-controller@a647ca4Jian ZhangUPSTREAM: <carry>: migrate jiazha test cases to OTE
2026-04-21 16:52:34openshift/operator-framework-operator-controller@b144b56Xia ZhaoUPSTREAM: <carry>: migrate clustercatalog case to ote
2026-04-21 16:52:35openshift/operator-framework-operator-controller@0c0a025Kui WangUPSTREAM: <carry>: migrate olmv1 QE stress cases
2026-04-21 16:52:36openshift/operator-framework-operator-controller@04103cbTodd ShortUPSTREAM: <carry>: Use busybox/httpd to simulate probes
2026-04-21 16:52:37openshift/operator-framework-operator-controller@75d8acfXia ZhaoUPSTREAM: <carry>: migrate olmv1 QE cases
2026-04-21 16:52:38openshift/operator-framework-operator-controller@dd577f9Kui WangUPSTREAM: <carry>: add agent for olmv1 qe cases
2026-04-21 16:52:39openshift/operator-framework-operator-controller@3d0464dTodd ShortUPSTREAM: <carry>: Disable upstream PodDisruptionBudget
2026-04-21 16:52:40openshift/operator-framework-operator-controller@0a5548bRashmi GottipatiUPSTREAM: <carry>: Add AGENTS.md for AI code contributions
2026-04-21 16:52:41openshift/operator-framework-operator-controller@956599eRashmi GottipatiUPSTREAM: <carry>: address review comments through addl prompts
2026-04-21 16:52:42openshift/operator-framework-operator-controller@ff9d8feRashmi GottipatiUPSTREAM: <carry>: addressing some more review comments
2026-04-21 16:52:43openshift/operator-framework-operator-controller@f7a33fbRashmi GottipatiUPSTREAM: <carry>: remove DCO line
2026-04-21 16:52:44openshift/operator-framework-operator-controller@71c96d2Bruno AndradeUPSTREAM: <carry>: migrate bandrade test cases to OTE
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f41bb2cBruno AndradeUPSTREAM: <carry>: update metadata
2026-04-21 16:52:45openshift/operator-framework-operator-controller@f6ce1f6Bruno AndradeUPSTREAM: <carry>: remove originalName
2026-04-21 16:52:46openshift/operator-framework-operator-controller@3015a66Jian ZhangUPSTREAM: <carry>: update 80458's timeout to 180s
2026-04-21 16:52:47openshift/operator-framework-operator-controller@7d04832Jian ZhangUPSTREAM: <carry>: update 83026 to specify the clustercatalog
2026-04-21 16:52:48openshift/operator-framework-operator-controller@56fb855Catherine Chan-TseUPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
2026-04-21 16:52:49openshift/operator-framework-operator-controller@d8f66c6Predrag KnezevicUPSTREAM: <carry>: Use oc client for running e2e tests
2026-04-21 16:52:50openshift/operator-framework-operator-controller@46a0123Predrag KnezevicUPSTREAM: <carry>: Run upstream e2e tests tagged with @catalogd-update
2026-04-21 16:52:51openshift/operator-framework-operator-controller@f8d4b18Kui WangUPSTREAM: <carry>: enhance case to make it more stable
2026-04-21 16:52:51openshift/operator-framework-operator-controller@a712c37Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:52:52openshift/operator-framework-operator-controller@43ad2c4Evan HearneUPSTREAM: <carry>: move sa creation out of buildCurlJob()
2026-04-21 16:52:53openshift/operator-framework-operator-controller@a7d0f3cEvan HearneUPSTREAM: <carry>: comment out delete service account
2026-04-21 16:52:54openshift/operator-framework-operator-controller@4eaa560Evan HearneUPSTREAM: <carry>: move defercleanup for sa for LIFO
2026-04-21 16:52:55openshift/operator-framework-operator-controller@cd2671eEvan HearneUPSTREAM: <carry>: add polling so job fully deleted before proceed
2026-04-21 16:52:56openshift/operator-framework-operator-controller@33920c3Luke MeyerUPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"
2026-04-21 16:52:57openshift/operator-framework-operator-controller@2f0ce9bCamila MacedoUPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
2026-04-21 16:52:58openshift/operator-framework-operator-controller@76b1e16Kui WangUPSTREAM: <carry>: config watchnamespace cases
2026-04-21 16:52:59openshift/operator-framework-operator-controller@d07a776Xia ZhaoUPSTREAM: <carry>: enhance ocp-79770
2026-04-21 16:53:00openshift/operator-framework-operator-controller@489ce79Kui WangUPSTREAM: <carry>: upgrade version support case
2026-04-21 16:53:01openshift/operator-framework-operator-controller@4bed2e4Per Goncalves da SilvaUPSTREAM: <carry>: Remove installed condition check from auth preflight test
2026-04-21 16:53:02openshift/operator-framework-operator-controller@a9f06e7Per Goncalves da SilvaUPSTREAM: <carry>: Add openshift/api dependency
2026-04-21 16:53:03openshift/operator-framework-operator-controller@b1b7948Per Goncalves da SilvaUPSTREAM: <carry>: Add boxcutter specific preflight auth test
2026-04-21 16:53:04openshift/operator-framework-operator-controller@efaf764Kui WangUPSTREAM: <carry>: adjust watchnamespace case based on change
2026-04-21 16:53:06openshift/operator-framework-operator-controller@ae14f8eCamila MacedoUPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir
2026-04-21 16:53:07openshift/operator-framework-operator-controller@3d327e5Bruno AndradeUPSTREAM: <carry>: add 83979 automation
2026-04-21 16:53:08openshift/operator-framework-operator-controller@aaec10eBruno AndradeUPSTREAM: <carry>: add 85889 automation
2026-04-21 16:53:09openshift/operator-framework-operator-controller@05bbdc9Per Goncalves da SilvaUPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints
2026-04-21 16:53:10openshift/operator-framework-operator-controller@0c8c7b0Per Goncalves da SilvaUPSTREAM: <carry>: Fix up own-namespace invalid configuration test
2026-04-21 16:53:11openshift/operator-framework-operator-controller@9b45d89Camila MacedoUPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh
2026-04-21 16:53:12openshift/operator-framework-operator-controller@43c811aKui WangUPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime
2026-04-21 16:53:13openshift/operator-framework-operator-controller@a066545Camila MacedoUPSTREAM: <carry>: Update OCP catalogs to v4.22
2026-04-21 16:53:14openshift/operator-framework-operator-controller@b774175Camila MacedoUPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies
2026-04-21 16:53:16openshift/operator-framework-operator-controller@58fa7a7Jian ZhangUPSTREAM: <carry>: fix 83026 for TP cluster
2026-04-21 16:53:17openshift/operator-framework-operator-controller@e04d539Kui WangUPSTREAM: <carry>: serviceAccount validation unified across all runtimes
2026-04-21 16:53:17openshift/operator-framework-operator-controller@38149d7Stephen BenjaminUPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
2026-04-21 16:53:18openshift/operator-framework-operator-controller@d61bb52Camila MacedoUPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests
2026-04-21 16:53:19openshift/operator-framework-operator-controller@8058aa1Evan HearneUPSTREAM: <carry>: add service account to curl job
2026-04-21 16:53:20openshift/operator-framework-operator-controller@d103627Jian ZhangUPSTREAM: <carry>: update OCP-75441 to support multi-arch
2026-04-21 16:53:21openshift/operator-framework-operator-controller@549b7baKui WangUPSTREAM: <carry>: deployment config cases
2026-04-21 16:53:21openshift/operator-framework-operator-controller@5d7f763Todd ShortUPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
2026-04-21 16:53:22openshift/operator-framework-operator-controller@afce0c8Todd ShortUPSTREAM: <carry>: Update openshift/api and client-go
2026-04-21 16:53:23openshift/operator-framework-operator-controller@0524e03Camila MacedoUPSTREAM: <carry>: Add boxcutter tests
2026-04-21 16:53:24openshift/operator-framework-operator-controller@3d8fa30Xia ZhaoUPSTREAM: <carry>: enhance QE cases
2026-04-21 16:53:25openshift/operator-framework-operator-controller@d296ff2Daniel FranzUPSTREAM: <carry>: Update quay-operator version to one containing arm64 support
2026-04-21 16:53:25openshift/operator-framework-operator-controller@2a41354Kui WangUPSTREAM: <carry>: verify volume/volumeMount override
2026-04-21 16:53:26openshift/operator-framework-operator-controller@d6091ebJian ZhangUPSTREAM: <carry>: Add long-duration test script and documents
2026-04-21 16:53:27openshift/operator-framework-operator-controller@91c36fcTodd ShortUPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
2026-04-21 16:53:28openshift/operator-framework-operator-controller@4abc1edCamila MacedoUPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests
2026-04-21 16:53:29openshift/operator-framework-operator-controller@7474ca3Camila MacedoUPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet
2026-04-21 16:53:30openshift/operator-framework-operator-controller@b5ef4b1Bruno AndradeUPSTREAM: <carry>: add ocp-87557
2026-04-21 16:53:31openshift/operator-framework-operator-controller@4235fe4Francesco GiudiciUPSTREAM: <carry>: Add fgiudici as reviewer
2026-04-21 16:53:31openshift/operator-framework-operator-controller@a599379Camila MacedoUPSTREAM: <carry>: Remove skip for incompatible operator check after rename of CER
2026-04-21 16:53:32openshift/operator-framework-operator-controller@c97b9dfKui WangUPSTREAM: <carry>: Test empty affinity erasure and cleanup
2026-04-21 16:53:33openshift/operator-framework-operator-controller@73fbd53Camila MacedoUPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in preflight test
2026-04-21 16:53:34openshift/operator-framework-operator-controller@ecfaa13Camila MacedoUPSTREAM: <carry>: Expand OTE docs with more comprehensive details
2026-04-21 16:53:35openshift/operator-framework-operator-controller@da7fd95Todd ShortUPSTREAM: <carry>: Disable upstream TLSProfile tests
2026-04-21 16:53:35openshift/operator-framework-operator-controller@b15cc7aCamila MacedoUPSTREAM: <carry>: OTE: Simplify by remove option to configure tests to run outside of OCP

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-botopenshift-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Apr 22, 2026
@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

@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

@coderabbitai

coderabbitaiBot commented Apr 22, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro Plus

Run ID: 10d62347-afba-478b-a81e-d543486dadfc

📥 Commits

Reviewing files that changed from the base of the PR and between 7c731ae and a7c5ee7.

📒 Files selected for processing (1)
  • requirements.txt

Walkthrough

A single dependency version is updated in the project's requirements file, upgrading the lxml package from version 6.0.2 to 6.1.0. No other dependencies are affected.

Changes

Cohort / File(s)Summary
Dependency Update
requirements.txt
Upgraded lxml from 6.0.2 to 6.1.0

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~1 minute


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 2 warnings, 3 inconclusive)

Check nameStatusExplanationResolution
Stable And Deterministic Test Names❌ ErrorTest file contains dynamic test names derived from catalog contents, violating stability requirements.Refactor test titles to use static names and move dynamic image references to test body statements.
Test Structure And Quality⚠️ WarningTest files lack meaningful assertion messages and violate single responsibility principle by testing multiple unrelated behaviors in single functions without proper timeouts.Add context messages to assertions, split multi-behavior tests into separate functions, implement context timeouts for cluster operations, and adopt consistent test helper patterns.
Microshift Test Compatibility⚠️ WarningTest file olmv1-deploymentconfig.go uses DeploymentConfig API unavailable on MicroShift but lacks required explicit protection mechanisms like [Skipped:MicroShift] label, [apigroup:...] tag, or exutil.IsMicroShiftCluster() runtime check.Add explicit MicroShift protection via [Skipped:MicroShift] label, [apigroup:apps.openshift.io] tag, or exutil.IsMicroShiftCluster() runtime guard in BeforeAll().
Title check❓ InconclusiveThe title 'NO-ISSUE: Synchronize From Upstream Repositories' is generic and overly broad. While it accurately describes a synchronization operation, it fails to highlight the specific main change (lxml dependency bump from 6.0.2 to 6.1.0) that the PR summary identifies as the key update.Consider using a more specific title like 'NO-ISSUE: Bump lxml from 6.0.2 to 6.1.0' to clearly convey the primary dependency update in the changeset.
Ote Binary Stdout Contract❓ InconclusiveRepository structure could not be fully examined to verify OTE Binary Stdout Contract violations in changed Go code.Review actual PR changes in Go code for stdout writes in main(), init(), TestMain(), BeforeSuite(), AfterSuite(), and ensure klog is configured with SetOutput(os.Stderr) or LogToStderr(true).
Ipv6 And Disconnected Network Test Compatibility❓ InconclusiveThe repository structure cannot be properly analyzed to assess IPv6 and disconnected network test compatibility due to inaccessible test file contents.Provide the actual test file diffs or commit details showing the specific Ginkgo test code being added to enable proper assessment of IPv4-only and external connectivity assumptions.
✅ Passed checks (6 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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.
Single Node Openshift (Sno) Test Compatibility✅ PassedThe newly added Ginkgo e2e tests do not require multi-node or HA cluster topologies and should be compatible with Single Node OpenShift deployments.
Topology-Aware Scheduling Compatibility✅ PassedThis PR only updates lxml from 6.0.2 to 6.1.0 in requirements.txt, a documentation tooling dependency. No deployment manifests, operator code, or scheduling constraints are modified.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@tmshort

Copy link
Copy Markdown
Contributor

/retest

@tmshort

Copy link
Copy Markdown
Contributor

/test e2e-gcp-ovn-upgrade

@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

/verified bypass

Rationale: All 1 upstream commit is low-risk — no production code changed, all CI jobs passed.

  • c92a607 (dependabot[bot]): Pure Python dep bump — lxml 6.0.2→6.1.0; XML library used only in scripts, not compiled into the Go binary.

🤖 Generated by Claude Code

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

Copy link
Copy Markdown

@tmshort: The verified label has been added.

Details

In response to this:

/verified bypass

Rationale: All 1 upstream commit is low-risk — no production code changed, all CI jobs passed.

  • c92a607 (dependabot[bot]): Pure Python dep bump — lxml 6.0.2→6.1.0; XML library used only in scripts, not compiled into the Go binary.

🤖 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 9b9eb03 into openshift:mainApr 23, 2026
14 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

16 participants

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