Skip to content

OPRUN-4164: Synchronize From Upstream Repositories - #484

Merged
openshift-merge-bot[bot] merged 17 commits into
openshift:mainfrom
tmshort:synchronize
Sep 25, 2025
Merged

OPRUN-4164: Synchronize From Upstream Repositories#484
openshift-merge-bot[bot] merged 17 commits into
openshift:mainfrom
tmshort:synchronize

Conversation

@tmshort

@tmshorttmshort commented Sep 24, 2025

Copy link
Copy Markdown
Contributor

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

perdasilvaand others added 16 commits September 19, 2025 09:43
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Bumps [regex](https://github.com/mrabarnett/mrab-regex) from 2025.9.1 to 2025.9.18.
- [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt)
- [Commits](mrabarnett/mrab-regex@2025.9.1...2025.9.18)
---
updated-dependencies:
- dependency-name: regex
dependency-version: 2025.9.18
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Relax webhook preconditions
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
* Fix up WithInstallModeSupportFor to include all install modes
Signed-off-by: Per G. da Silva <pegoncal@redhat.com>
* Add CheckConversionWebhookSupport to validator
Signed-off-by: Per G. da Silva <pegoncal@redhat.com>
* Add check for install mode support
Signed-off-by: Per G. da Silva <pegoncal@redhat.com>
* Update error messages
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
* Remove error sorting by webhook name
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
---------
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: Per G. da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
* Add webhook rule checker
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
* fix ups
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
* Add webhook rule checker to validator
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
---------
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Bumps [lxml](https://github.com/lxml/lxml) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-6.0.1...lxml-6.0.2)
---
updated-dependencies:
- dependency-name: lxml
dependency-version: 6.0.2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Given that at the creation we can create a revision with no phases, we should
declare `.spec.phases` as optional.
Added initial set of unit tests to assert CER .spec immutability.
Followup of #2145: given that `config` folder is going to be removed soon,
`internal/operator-controller/controllers/suite_test.go` loads CRDs from
`helm/olmv1/base/operator-controller/crd`.
Creation of `envtest.Environment` moved and consolidated into `test/utils.go`
so that it can be consumed by multiple test suites.
The tls flags are required if metrics-bind-address is set. Adding the
certManager option to the tilt.yaml chart makes Tilt work again.
Also fixed a couple spelling errors.
* Remove the kustomize config
Add a helm/OWNERS file (copied from config/OWNERS)
Update hack/tools/update-crds.sh to not reference config directory
Signed-off-by: Todd Short <tshort@redhat.com>
* Fixup unit test config paths
Signed-off-by: Todd Short <tshort@redhat.com>
* Update CRD locations for crd-diff
Signed-off-by: Todd Short <tshort@redhat.com>
---------
Signed-off-by: Todd Short <tshort@redhat.com>
Added the validation rules and the unit tests.
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
@openshift-ci-robotopenshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 24, 2025
@openshift-ci-robot

openshift-ci-robot commented Sep 24, 2025

Copy link
Copy Markdown

@tmshort: This pull request references OPRUN-4164 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

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.

1 similar comment
@openshift-ci-robot

openshift-ci-robot commented Sep 24, 2025

Copy link
Copy Markdown

@tmshort: This pull request references OPRUN-4164 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

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

@openshift-ci

openshift-ciBot commented Sep 24, 2025

Copy link
Copy Markdown
Contributor

@tmshort: 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:

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

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-ciopenshift-ciBot added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Sep 24, 2025
@openshift-ci

openshift-ciBot commented Sep 24, 2025

Copy link
Copy Markdown
Contributor

@tmshort: The label(s) /label kind/sync cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

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.

@tmshort

Copy link
Copy Markdown
ContributorAuthor

/approve

@openshift-ci

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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-ciopenshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2025
@perdasilva

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2025
@bandrade

Copy link
Copy Markdown
Contributor

/verified by @bandrade

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

Copy link
Copy Markdown

@bandrade: This PR has been marked as verified by @bandrade.

Details

In response to this:

/verified by @bandrade

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.

@bandrade

Copy link
Copy Markdown
Contributor

/label qe-approved

@openshift-ciopenshift-ciBot added the qe-approved Signifies that QE has signed off on this PR label Sep 24, 2025
@openshift-ci-robot

openshift-ci-robot commented Sep 24, 2025

Copy link
Copy Markdown

@tmshort: This pull request references OPRUN-4164 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

THIS IS A SQUASHED VERSION OF THE UPSTREAM <CARRY> COMMITS

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

DateCommitAuthorMessage
2025-09-24 09:27:09operator-framework/operator-controller@0faf118Predrag KnezevicClusterExtensionRevision.spec.revision must be positive (#2231)
2025-09-24 05:01:05operator-framework/operator-controller@c6a2fedTodd Short🌱 OPRUN-4077: Remove the kustomize config (#2213)
2025-09-24 03:49:12operator-framework/operator-controller@6332ae3Tayler GeigerAdd certManager option to tilt.yaml helm chart (#2233)
2025-09-23 19:14:26operator-framework/operator-controller@47f8d31Predrag KnezevicLoad CRDs for envtests from chart directory (#2232)
2025-09-22 20:56:01operator-framework/operator-controller@16d1089Predrag KnezevicMake ClusterExtensionRevision.spec.phases optional (#2230)
2025-09-22 20:53:10operator-framework/operator-controller@31e8b60dependabot[bot]🌱 Bump lxml from 6.0.1 to 6.0.2 (#2229)
2025-09-19 14:38:43operator-framework/operator-controller@d3e8883Per Goncalves da SilvaOPRUN-4151: Add webhook rule validation (#2226)
2025-09-19 14:35:56operator-framework/operator-controller@5478ac6Per Goncalves da SilvaOPRUN-4150: Relax webhook support preconditions (#2222)
2025-09-19 14:32:50operator-framework/operator-controller@ee3456adependabot[bot]🌱 Bump regex from 2025.9.1 to 2025.9.18 (#2228)
2025-09-19 09:43:12operator-framework/operator-controller@8fafb65Per Goncalves da SilvaAdd pedjak to OWNER_ALIASES as reviwer (#2227)

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

DateCommitAuthorMessage
2025-09-19 00:07:03openshift/operator-framework-operator-controller@971ac15dtfranzUPSTREAM: <carry>: Add OpenShift specific files
2025-09-19 00:07:06openshift/operator-framework-operator-controller@43e5f1dTodd ShortUPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
2025-09-19 00:07:11openshift/operator-framework-operator-controller@a84a4baTodd ShortUPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
2025-09-19 00:07:16openshift/operator-framework-operator-controller@828e8b0Catherine Chan-TseUPSTREAM: <carry>: Add openshift node selector annotation
2025-09-19 00:07:18openshift/operator-framework-operator-controller@8a17a34Todd ShortUPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
2025-09-19 00:07:21openshift/operator-framework-operator-controller@2b17a7dJian ZhangUPSTREAM: <carry>: set the SElinux type
2025-09-19 00:07:24openshift/operator-framework-operator-controller@7cd1e46Camila MacedoUPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs
2025-09-19 00:07:28openshift/operator-framework-operator-controller@627b33dCamila MacedoUPSTREAM: <carry>: Add vendor files for the catalog-sync tests
2025-09-19 00:07:32openshift/operator-framework-operator-controller@678cc14Todd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:07:36openshift/operator-framework-operator-controller@44a012eTodd ShortUPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
2025-09-19 00:07:42openshift/operator-framework-operator-controller@30fdeb1Todd ShortUPSTREAM: <carry>: Update HOWTO-origin-tests
2025-09-19 00:07:47openshift/operator-framework-operator-controller@269df4fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"
2025-09-19 00:07:50openshift/operator-framework-operator-controller@212674dCamila MacedoUPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
2025-09-19 00:07:54openshift/operator-framework-operator-controller@410921fCamila MacedoUPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)
2025-09-19 00:07:58openshift/operator-framework-operator-controller@a972a67Camila MacedoUPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios
2025-09-19 00:08:02openshift/operator-framework-operator-controller@0580f48Camila MacedoUPSTREAM: <carry>: Default Catalog Remove hack directory which is not used
2025-09-19 00:08:05openshift/operator-framework-operator-controller@df5b640Camila MacedoUPSTREAM: <carry>: Change code implementation to extract layers in OCP env
2025-09-19 00:08:10openshift/operator-framework-operator-controller@9c07754Camila MacedoUPSTREAM: <carry>: Add vendor files for change in the extract code implementation
2025-09-19 00:08:14openshift/operator-framework-operator-controller@f028e60Camila MacedoUPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation
2025-09-19 00:08:18openshift/operator-framework-operator-controller@c6fb766Jian ZhangUPSTREAM: <carry>: SELinux type for operator-controller
2025-09-19 00:08:21openshift/operator-framework-operator-controller@f0bfedbTodd ShortUPSTREAM: <carry>: Bump catalog versions to 4.19
2025-09-19 00:08:25openshift/operator-framework-operator-controller@fcc0e3dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem
2025-09-19 00:08:30openshift/operator-framework-operator-controller@7c84c4eCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
2025-09-19 00:08:34openshift/operator-framework-operator-controller@1e6314bCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support
2025-09-19 00:08:37openshift/operator-framework-operator-controller@e1ecf22Camila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks
2025-09-19 00:08:41openshift/operator-framework-operator-controller@02ae39dCamila MacedoUPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
2025-09-19 00:08:44openshift/operator-framework-operator-controller@64d2a26AOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:48openshift/operator-framework-operator-controller@806fbadAOS Automation Release TeamUPSTREAM: <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
2025-09-19 00:08:52openshift/operator-framework-operator-controller@676a673Todd ShortUPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
2025-09-19 00:08:58openshift/operator-framework-operator-controller@9a5f92aCamila MacedoUPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue
2025-09-19 00:09:05openshift/operator-framework-operator-controller@11378d4Camila MacedoUPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
2025-09-19 00:09:12openshift/operator-framework-operator-controller@33d1eefTodd ShortUPSTREAM: <carry>: Add support for experimental manifests
2025-09-19 00:09:20openshift/operator-framework-operator-controller@425bd20Camila MacedoUPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable target call
2025-09-19 00:09:26openshift/operator-framework-operator-controller@27c7483Todd ShortUPSTREAM: <carry>: Remove build of test image registry
2025-09-19 00:09:32openshift/operator-framework-operator-controller@2630639Todd ShortUPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile
2025-09-19 00:09:40openshift/operator-framework-operator-controller@3e47f70Camila MacedoUPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
2025-09-19 00:09:52openshift/operator-framework-operator-controller@94ea7d0Todd ShortUPSTREAM: <carry>: Fix experimental manifest copying
2025-09-19 00:09:58openshift/operator-framework-operator-controller@c6ebdb2Todd ShortUPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
2025-09-19 00:10:06openshift/operator-framework-operator-controller@2ccf670Camila MacedoUPSTREAM: <carry>: [OTE] - Add tracking mechanism
2025-09-19 00:10:14openshift/operator-framework-operator-controller@22cb4efCamila MacedoUPSTREAM: <carry>: Update OTE dep to get fix
2025-09-19 00:10:23openshift/operator-framework-operator-controller@21f3f60Camila MacedoUPSTREAM: <carry>: [OTE] Add Readme
2025-09-19 00:10:36openshift/operator-framework-operator-controller@be68262Rashmi GottipatiUPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
2025-09-19 00:10:44openshift/operator-framework-operator-controller@73770e0Ankita ThomasUPSTREAM: <carry>: add openshift specific build target to pass commit info downstream
2025-09-19 00:10:53openshift/operator-framework-operator-controller@56f6822Brett TofelUPSTREAM: <carry>: add source commit into binaries when linking
2025-09-19 00:11:01openshift/operator-framework-operator-controller@5058365Camila MacedoUPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
2025-09-19 00:11:11openshift/operator-framework-operator-controller@91c2d9aCamila MacedoUPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining
2025-09-19 00:11:17openshift/operator-framework-operator-controller@d080b3fCamila MacedoUPSTREAM: <carry>: OTE - How to test locally with OCP instances
2025-09-19 00:11:25openshift/operator-framework-operator-controller@14ed7ddCamila MacedoUPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent
2025-09-19 00:11:32openshift/operator-framework-operator-controller@fb7c104Camila MacedoUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:38openshift/operator-framework-operator-controller@03fe8b4Todd ShortUPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
2025-09-19 00:11:45openshift/operator-framework-operator-controller@e7e2d93Todd ShortUPSTREAM: <carry>: Handle service-ca cert availability/rotation
2025-09-19 00:11:52openshift/operator-framework-operator-controller@97b5b67Luke MeyerUPSTREAM: <carry>: [OTE] add webhook tests
2025-09-19 00:11:58openshift/operator-framework-operator-controller@8086766Camila MacedoUPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
2025-09-19 00:12:05openshift/operator-framework-operator-controller@91f3068Todd ShortUPSTREAM: <carry>: Remove bindata generation from build
2025-09-19 00:12:11openshift/operator-framework-operator-controller@644da89Camila MacedoUPSTREAM: <carry>: [OTE] Add webhook tests
2025-09-19 00:12:17openshift/operator-framework-operator-controller@79dc489Camila MacedoUPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions
2025-09-19 00:12:23openshift/operator-framework-operator-controller@f3e2634Camila MacedoUPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
2025-09-19 00:12:30openshift/operator-framework-operator-controller@a9dbd4dCamila MacedoUPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation
2025-09-19 00:12:35openshift/operator-framework-operator-controller@d3af372Camila MacedoUPSTREAM: <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.
2025-09-19 00:12:41openshift/operator-framework-operator-controller@cfa430cCamila MacedoUPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests
2025-09-19 00:12:47openshift/operator-framework-operator-controller@3e448bdgrokspawnUPSTREAM: <carry>: remove obsolete owners
2025-09-19 00:12:54openshift/operator-framework-operator-controller@4dd4727Camila MacedoUPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
2025-09-19 00:13:01openshift/operator-framework-operator-controller@eb7d3acCamila MacedoUPSTREAM: <carry>: Migrate single/own namespace tests
2025-09-19 00:13:06openshift/operator-framework-operator-controller@99ac258Forrest BabcockUPSTREAM: <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.
2025-09-19 00:13:12openshift/operator-framework-operator-controller@fa98303Camila MacedoUPSTREAM: <carry>: Ensure unique name for bad-catalog tests
2025-09-19 00:13:18openshift/operator-framework-operator-controller@2068a04Todd ShortUPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
2025-09-19 00:13:24openshift/operator-framework-operator-controller@1b0152cJian ZhangUPSTREAM: <carry>: grant QE approver permission for OTE
2025-09-19 00:13:30openshift/operator-framework-operator-controller@795c75ePer Goncalves da SilvaUPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator
2025-09-19 00:13:36openshift/operator-framework-operator-controller@f6cfcd3Anik BhattacharjeeUPSTREAM: <carry>: update operator-controller to v1.5.1
2025-09-19 00:13:43openshift/operator-framework-operator-controller@548c133Anik BhattacharjeeUPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests
2025-09-19 00:13:49openshift/operator-framework-operator-controller@a8f8909Jian ZhangUPSTREAM: <carry>: add jiazha to approvers
2025-09-19 00:13:55openshift/operator-framework-operator-controller@1a23c4fTodd ShortUPSTREAM: <carry>: Create combined manifests for comparison
2025-09-19 00:13:58openshift/operator-framework-operator-controller@4867f22Todd ShortUPSTREAM: <carry>: Use Helm charts for openshift manifests
2025-09-19 00:14:00openshift/operator-framework-operator-controller@3a400cdKui WangUPSTREAM: <carry>: add support for tests-private cases and add the case

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
/label tide/merge-method-merge
/label kind/sync

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

@openshift-ci-robot

Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 83ffc35 and 2 for PR HEAD ae0b775 in total

@tmshort

Copy link
Copy Markdown
ContributorAuthor

/test openshift-e2e-aws-techpreview
/test okd-scos-e2e-aws-ovn

@tmshort

Copy link
Copy Markdown
ContributorAuthor

/test openshift-e2e-aws-techpreview
/test openshift-e2e-aws

The short name was causing downstream issues:
```
image name curlimages/curl:8.15.0 returns ambiguous list
```
Using the long name seems to fix this.
Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-ci-robotopenshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Sep 25, 2025
@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
@perdasilva

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
@kuiwang02

Copy link
Copy Markdown
Contributor

/retest-required

@tmshort

Copy link
Copy Markdown
ContributorAuthor

The openshift-e2e-aws-techpreview test failed due to timeout during the must-gather phase, the actual tests passed.

@bandrade

Copy link
Copy Markdown
Contributor

/verified by @bandrade

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

Copy link
Copy Markdown

@bandrade: This PR has been marked as verified by @bandrade.

Details

In response to this:

/verified by @bandrade

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

Copy link
Copy Markdown
ContributorAuthor

/retest-required

@openshift-ci

Copy link
Copy Markdown
Contributor

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

Test nameCommitDetailsRequiredRerun command
ci/prow/openshift-e2e-aws-techpreviewfd85e1blinkfalse/test openshift-e2e-aws-techpreview

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.

@openshift-merge-bot
openshift-merge-botBot merged commit a367d6c into openshift:mainSep 25, 2025
11 of 12 checks passed
@tmshort
tmshort deleted the synchronize branch September 25, 2025 19:14
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.lgtmIndicates that a PR is ready to be merged.qe-approvedSignifies that QE has signed off on this PRtide/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.

8 participants

@tmshort@openshift-ci-robot@perdasilva@bandrade@kuiwang02@pedjak@trgeiger@dtfranz