OCPBUGS-76381,OCPBUGS-76383,OCPBUGS-78211,OCPBUGS-78455: Synchronize From Upstream Repositories#682

Merged

openshift-merge-bot[bot] merged 96 commits intoopenshift:mainfrom

tmshort:synchronize

Mar 31, 2026

Commits on Mar 27, 2026

🌱 Return *DeploymentConfig directly from GetDeploymentConfig() (#2598)

joelanford
and
claude
authored
fix(boxcutter): detect collision when duplicate package is installed after upgrade (#2578)
camilamacedo86
authored
:seedling: Bump marocchino/sticky-pull-request-comment from 2 to 3 (#2601)
dependabot[bot]
authored

Commits on Mar 30, 2026

Commits on Mar 31, 2026

chore(rename CER to COS): Follow up to ajust desc in claude command (#2608)
camilamacedo86
authored
Fix serviceAccountName placement in test bundles (#2611)
camilamacedo86
authored
fix(deploymentConfig): handle empty affinity objects to match OLMv0 erasure behavior (#2591)

camilamacedo86
and
claude
authored
Merge branch 'main' into synchronize
tmshort
committed
UPSTREAM: <carry>: Add OpenShift specific files

dtfranz
authored and
tmshort
committed
UPSTREAM: <carry>: Add new tests for single/own namespaces install modes

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Update OCP catalogs to v4.21
tmshort
committed
UPSTREAM: <carry>: support singleown cases in disconnected

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Update to new feature-gate options in helm
tmshort
committed
UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c69 )

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Add [OTP] to migrated cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: [OTE]: Upgrade dependencies used

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: add disconnected environment support with custom prow job for migrated qe cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: migrate jiazha test cases to OTE

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: migrate clustercatalog case to ote

authored and
tmshort
committed
UPSTREAM: <carry>: migrate olmv1 QE stress cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Use busybox/httpd to simulate probes
tmshort
committed
UPSTREAM: <carry>: migrate olmv1 QE cases

Xia-Zhao-rh
authored and
tmshort
committed
UPSTREAM: <carry>: add agent for olmv1 qe cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Disable upstream PodDisruptionBudget
tmshort
committed
UPSTREAM: <carry>: Add AGENTS.md for AI code contributions

rashmigottipati
authored and
tmshort
committed
UPSTREAM: <carry>: address review comments through addl prompts

rashmigottipati
authored and
tmshort
committed
UPSTREAM: <carry>: addressing some more review comments

rashmigottipati
authored and
tmshort
committed
UPSTREAM: <carry>: remove DCO line

rashmigottipati
authored and
tmshort
committed
UPSTREAM: <carry>: migrate bandrade test cases to OTE

bandrade
authored and
tmshort
committed
UPSTREAM: <carry>: update metadata

bandrade
authored and
tmshort
committed
UPSTREAM: <carry>: remove originalName

bandrade
authored and
tmshort
committed
UPSTREAM: <carry>: update 80458's timeout to 180s

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: update 83026 to specify the clustercatalog

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22

oceanc80
authored and
tmshort
committed
UPSTREAM: <carry>: Use oc client for running e2e tests

pedjak
authored and
tmshort
committed
UPSTREAM: <carry>: Run upstream e2e tests tagged with `@catalogd-update`

pedjak
authored and
tmshort
committed
UPSTREAM: <carry>: enhance case to make it more stable

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: add service account to curl job

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: move sa creation out of buildCurlJob()

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: comment out delete service account

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: move defercleanup for sa for LIFO

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: add polling so job fully deleted before proceed

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job"

sosiouxme
authored and
tmshort
committed
UPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: config watchnamespace cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: enhance ocp-79770

Xia-Zhao-rh
authored and
tmshort
committed
UPSTREAM: <carry>: upgrade version support case

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Remove installed condition check from auth preflight test

Per Goncalves da Silva
authored and
tmshort
committed
UPSTREAM: <carry>: Add openshift/api dependency

Per Goncalves da Silva
authored and
tmshort
committed
UPSTREAM: <carry>: Add boxcutter specific preflight auth test

Per Goncalves da Silva
authored and
tmshort
committed
UPSTREAM: <carry>: adjust watchnamespace case based on change

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root dir

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: add 83979 automation

bandrade
authored and
tmshort
committed
UPSTREAM: <carry>: add 85889 automation

bandrade
authored and
tmshort
committed
UPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints

Per Goncalves da Silva
authored and
tmshort
committed
UPSTREAM: <carry>: Fix up own-namespace invalid configuration test

Per Goncalves da Silva
authored and
tmshort
committed
UPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles instead of openshift-pipelines-operator-rh

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Update OCP catalogs to v4.22

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and dependencies

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: fix 83026 for TP cluster

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: serviceAccount validation unified across all runtimes

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6

authored and
tmshort
committed
UPSTREAM: <carry>: Increase install timeout and add diagnostic logging for CE install tests

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: add service account to curl job

ehearne-redhat
authored and
tmshort
committed
UPSTREAM: <carry>: update OCP-75441 to support multi-arch

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: deployment config cases

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support

tmshort
and
claude
committed
UPSTREAM: <carry>: Update openshift/api and client-go
tmshort
committed
UPSTREAM: <carry>: Add boxcutter tests

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: enhance QE cases

Xia-Zhao-rh
authored and
tmshort
committed
UPSTREAM: <carry>: Update quay-operator version to one containing arm64 support

dtfranz
authored and
tmshort
committed
UPSTREAM: <carry>: verify volume/volumeMount override

kuiwang02
authored and
tmshort
committed
UPSTREAM: <carry>: Add long-duration test script and documents

jianzhangbjz
authored and
tmshort
committed
UPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
tmshort
committed
UPSTREAM: <drop>: go mod vendor
tmshort
committed
UPSTREAM: <drop>: remove upstream GitHub configuration
tmshort
committed
UPSTREAM: <drop>: configure the commit-checker
tmshort
committed
UPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSet in OTE tests

camilamacedo86
authored and
tmshort
committed
UPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet

camilamacedo86
authored and
tmshort
committed