Skip to content

NO-ISSUE: Synchronize From Upstream Repositories#597

Merged
openshift-merge-bot[bot] merged 84 commits intoopenshift:mainfrom
pedjak:synchronize-upstream
Jan 13, 2026
Merged

NO-ISSUE: Synchronize From Upstream Repositories#597
openshift-merge-bot[bot] merged 84 commits intoopenshift:mainfrom
pedjak:synchronize-upstream

Conversation

@pedjak
Copy link
Contributor

@pedjak pedjak commented Jan 8, 2026 •
edited
Loading

This PR replaces #582 and should be merged instead because it contains the commit that fixes upstream e2e test execution.

  • Change the experimental-e2e to use a two-node kind cluster (#2382)
  • Move the kind configs into a subdirectory (#2384)
  • 🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
  • 🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
  • Migrate e2e tests to Godog BDD framework (#2365)
  • Update goreleaser to v2.11.2 (#2390)
  • Updating docs strings for API go definitions (#2359)
  • 🌱 Bump golang.org/x/sync from 0.18.0 to 0.19.0 (#2391)
  • 🌱 Bump github.com/spf13/cobra from 1.10.1 to 1.10.2 (#2392)
  • Update using bingo golang-ci from v2.6.2 to v2.7.2 (#2395)
  • 🌱 Bump platformdirs from 4.5.0 to 4.5.1 (#2397)
  • Update go version to 1.25.3 (#2400)
  • Migrate E2e NetworkPolicy tests to static analysis with kube-score and conftest (#2393)
  • Add CLAUDE command and new check to review and lint the API changes (#2399)
  • 🌱 Bump pymdown-extensions from 10.17.2 to 10.18 (#2401)
  • 🌱 Bump github.com/cert-manager/cert-manager (#2403)
  • 🌱 Bump urllib3 from 2.6.0 to 2.6.1 (#2406)
  • 🌱 Bump golang.org/x/mod from 0.30.0 to 0.31.0 (#2404)
  • 🌱 Bump golang.org/x/tools from 0.39.0 to 0.40.0 (#2405)
  • Add camilamacedo86 to approvers (#2408)
  • 🌱 Bump github.com/operator-framework/api from 0.36.0 to 0.37.0 (#2414)
  • 🌱 Bump codecov/codecov-action from 5.5.1 to 5.5.2 (#2412)
  • 🌱 Bump helm.sh/helm/v3 from 3.19.3 to 3.19.4 (#2415)
  • 🌱 Bump urllib3 from 2.6.1 to 2.6.2 (#2416)
  • 🌱 Bump pymdown-extensions from 10.18 to 10.19 (#2417)
  • 🌱 Bump pymdown-extensions from 10.19 to 10.19.1 (#2419)
  • 🌱 Bump github.com/containerd/containerd from 1.7.29 to 1.7.30 (#2421)
  • 🌱 Bump github.com/BurntSushi/toml from 1.5.0 to 1.6.0 (#2422)
  • 🌱 Bump mkdocs-material from 9.7.0 to 9.7.1 (#2423)
  • 🌱 Bump soupsieve from 2.8 to 2.8.1 (#2424)
  • Fix unaddressed comments on PR #2393 (#2402)
  • Upgrade controller-gen from v0.19.0 to v0.20.0 (#2425)
  • 🌱 Bump actions/upload-artifact from 5 to 6 (#2418)
  • Fix command and shell consider fixed sceanrios (#2410)
  • (fix) Api documentation (#2409)
  • 🌱 [Updated] Bump sigs.k8s.io/controller-tools from 0.19.0 to 0.20.0 in the k8s-dependencies group (#2427)
  • Promote Single Own Feature Gate AND Config spec in the CR to GA (#2428)
  • standardizing approach for required-tests-with-occasional-overrides (#2431)
  • 📖 Clarify install mode docs (#2430)
  • Fix ClusterCatalog Priority field validation markers (#2432)
  • UPSTREAM: : Add OpenShift specific files
  • UPSTREAM: : Add new tests for single/own namespaces install modes
  • UPSTREAM: : Upgrade OCP image from 4.20 to 4.21
  • UPSTREAM: : [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
  • UPSTREAM: : Update OCP catalogs to v4.21
  • UPSTREAM: : support singleown cases in disconnected
  • UPSTREAM: : fix cases 81696 and 74618 for product code changes
  • UPSTREAM: : Define Default timeouts and apply their usage accross to avoid flakes
  • UPSTREAM: : Update to new feature-gate options in helm
  • UPSTREAM: : Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
  • UPSTREAM: : [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
  • UPSTREAM: : Update OwnSingle template to use spec.config.inline.watchNamespace
  • UPSTREAM: : [OTE]: Add webhook cleanup validation on extension uninstall
  • UPSTREAM: : Add [OTP] to migrated cases
  • UPSTREAM: : [OTE]: Upgrade dependencies used
  • UPSTREAM: : fix(OTE): fix OpenShift Kubernetes replace version format
  • UPSTREAM: : [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
  • UPSTREAM: : add disconnected environment support with custom prow job for migrated qe cases
  • UPSTREAM: : migrate jiazha test cases to OTE
  • UPSTREAM: : migrate clustercatalog case to ote
  • UPSTREAM: : migrate olmv1 QE stress cases
  • UPSTREAM: : Use busybox/httpd to simulate probes
  • UPSTREAM: : migrate olmv1 QE cases
  • UPSTREAM: : add agent for olmv1 qe cases
  • UPSTREAM: : Disable upstream PodDisruptionBudget
  • UPSTREAM: : Add AGENTS.md for AI code contributions
  • UPSTREAM: : address review comments through addl prompts
  • UPSTREAM: : addressing some more review comments
  • UPSTREAM: : remove DCO line
  • UPSTREAM: : migrate bandrade test cases to OTE
  • UPSTREAM: : update metadata
  • UPSTREAM: : remove originalName
  • UPSTREAM: : update 80458's timeout to 180s
  • UPSTREAM: : update 83026 to specify the clustercatalog
  • UPSTREAM: : Update to golang 1.25 and ocp 4.22
  • UPSTREAM: : go mod vendor
  • UPSTREAM: : remove upstream GitHub configuration
  • UPSTREAM: : configure the commit-checker
  • Use oc client and skip tests as before

tmshort and others added 30 commits December 12, 2025 16:26
@tmshort
Change the experimental-e2e to use a two-node kind cluster (#2382)
841cbde 
In order to fully support multiple replicas, we need to be able to run
our tests in a multi-node environment, but we don't _always_ want to
run in a multi-node test environment.

Update the experimental-e2e to run a 2-node kind cluster (both control-
plane).

Update the `kind-load` recipe to directly load a docker image via
`load docker-image`, since `load image-archive` has issues with
multi-node clusters.

Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort
Move the kind configs into a subdirectory (#2384)
87b2a72 
Rather than litter the root directory with kind configs, add them to
a subdirectory.
Also rename the experimental one to indicate it's for 2 nodes.

Signed-off-by: Todd Short <tshort@redhat.com>
@dependabot
🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
b76407a 
Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.14.2 to 4.14.3.

---
updated-dependencies:
- dependency-name: beautifulsoup4
  dependency-version: 4.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
96ce9e5 
Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](klauspost/compress@v1.18.1...v1.18.2)

---
updated-dependencies:
- dependency-name: github.com/klauspost/compress
  dependency-version: 1.18.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pedjak
Migrate e2e tests to Godog BDD framework (#2365)
aaffdeb 
Replace traditional Go e2e tests with Godog (Cucumber for Go) to improve
test readability and maintainability through behavior-driven development.

Changes:
- Convert existing test scenarios to Gherkin feature files
- Implement reusable step definitions in steps/steps.go
- Add scenario hooks for setup/teardown and feature gate detection
- Provide comprehensive documentation in test/e2e/README.md
- Remove legacy test files (cluster_extension_install_test.go, etc.)

Benefits:
- Human-readable test scenarios serve as living documentation
- Better separation between test specification and implementation
- Easier collaboration between technical and non-technical stakeholders
- Reduced code duplication through reusable step definitions

Assisted-By: "Claude <noreply@anthropic.com>"
@tmshort
Update goreleaser to v2.11.2 (#2390)
c5d9fed 
This version requires golang 1.24.6 (which is our max version) but also
supports golang 1.25.3. This is the maximum version of goreleaser that
we can move to given our golang version constraints of having to support
golang 1.24 while moving to golang 1.25.

Updates the config file to v2

Signed-off-by: Todd Short <tshort@redhat.com>
@michaelryanpeter
Updating docs strings for API go definitions (#2359)
aea576c
@dependabot
🌱 Bump golang.org/x/sync from 0.18.0 to 0.19.0 (#2391)
410f092 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.18.0 to 0.19.0.
- [Commits](golang/sync@v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump github.com/spf13/cobra from 1.10.1 to 1.10.2 (#2392)
cc8ed2b 
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.10.1...v1.10.2)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-version: 1.10.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>
@camilamacedo86
Update using bingo golang-ci from v2.6.2 to v2.7.2 (#2395)
a85d6d1
@dependabot
🌱 Bump platformdirs from 4.5.0 to 4.5.1 (#2397)
90cd55a 
Bumps [platformdirs](https://github.com/tox-dev/platformdirs) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/tox-dev/platformdirs/releases)
- [Changelog](https://github.com/tox-dev/platformdirs/blob/main/CHANGES.rst)
- [Commits](tox-dev/platformdirs@4.5.0...4.5.1)

---
updated-dependencies:
- dependency-name: platformdirs
  dependency-version: 4.5.1
  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>
@tmshort
Update go version to 1.25.3 (#2400)
2b94dbc 
Signed-off-by: Todd Short <tshort@redhat.com>
@pedjak @claude
Migrate E2e NetworkPolicy tests to static analysis with kube-score an…
08436e0 
…d conftest (#2393)

Replace the e2e NetworkPolicy tests with static analysis tools that validate
NetworkPolicy configurations at build time rather than runtime.

Tools:
- kube-score: https://github.com/zegl/kube-score
- conftest: https://www.conftest.dev/
- OPA (Open Policy Agent): https://www.openpolicyagent.org/docs/latest/policy-language/

Changes:
- Add kube-score via bingo for validating deployed NetworkPolicy resources
- Add conftest via bingo for OPA-based policy validation of Helm charts
- Add OPA policies to enforce NetworkPolicy requirements:
  - Deny-all default policy must exist
  - catalogd-controller-manager must allow ingress on ports 7443, 8443, 9443
  - operator-controller-controller-manager must allow ingress on port 8443
  - Both controllers must have general egress enabled
  - Prometheus NetworkPolicy must allow ingress/egress (when deployed)
- Add lint-helm target integration with conftest policy checks
- Add lint-deployed-resources target for runtime validation with kube-score
- Add conftest validation to manifest generation
- Add CI workflow to detect NetworkPolicy changes in PRs and post a comment
- Remove network_policy_test.go as tests are now covered by static analysis

This approach provides faster feedback by catching NetworkPolicy issues during
helm linting and manifest generation rather than requiring a full e2e test run.

Co-authored-by: Claude <noreply@anthropic.com>
@camilamacedo86
Add CLAUDE command and new check to review and lint the API changes (…
578dc33 
…#2399)
@dependabot
🌱 Bump pymdown-extensions from 10.17.2 to 10.18 (#2401)
77eded4 
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.17.2 to 10.18.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.17.2...10.18)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: '10.18'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump github.com/cert-manager/cert-manager (#2403)
0baa4ba 
Bumps [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) from 1.18.2 to 1.19.2.
- [Release notes](https://github.com/cert-manager/cert-manager/releases)
- [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md)
- [Commits](cert-manager/cert-manager@v1.18.2...v1.19.2)

---
updated-dependencies:
- dependency-name: github.com/cert-manager/cert-manager
  dependency-version: 1.19.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump urllib3 from 2.6.0 to 2.6.1 (#2406)
3992ea0 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.6.0...2.6.1)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.6.1
  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>
@dependabot
🌱 Bump golang.org/x/mod from 0.30.0 to 0.31.0 (#2404)
19f7d39 
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.30.0 to 0.31.0.
- [Commits](golang/mod@v0.30.0...v0.31.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-version: 0.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump golang.org/x/tools from 0.39.0 to 0.40.0 (#2405)
882c344 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.39.0...v0.40.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-version: 0.40.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@camilamacedo86
Add camilamacedo86 to approvers (#2408)
bd540c9
@dependabot
🌱 Bump github.com/operator-framework/api from 0.36.0 to 0.37.0 (#2414)
5ae294a 
Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.36.0 to 0.37.0.
- [Release notes](https://github.com/operator-framework/api/releases)
- [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md)
- [Commits](operator-framework/api@v0.36.0...v0.37.0)

---
updated-dependencies:
- dependency-name: github.com/operator-framework/api
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump codecov/codecov-action from 5.5.1 to 5.5.2 (#2412)
b515cd4 
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v5.5.1...v5.5.2)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.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>
@dependabot
🌱 Bump helm.sh/helm/v3 from 3.19.3 to 3.19.4 (#2415)
d8a5063 
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.19.3 to 3.19.4.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.19.3...v3.19.4)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-version: 3.19.4
  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>
@dependabot
🌱 Bump urllib3 from 2.6.1 to 2.6.2 (#2416)
48f2e3e 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.6.1...2.6.2)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.6.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>
@dependabot
🌱 Bump pymdown-extensions from 10.18 to 10.19 (#2417)
109ecdc 
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.18 to 10.19.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.18...10.19)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: '10.19'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump pymdown-extensions from 10.19 to 10.19.1 (#2419)
4acd04f 
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.19 to 10.19.1.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.19...10.19.1)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: 10.19.1
  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>
@dependabot
🌱 Bump github.com/containerd/containerd from 1.7.29 to 1.7.30 (#2421)
d16e1d7 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.29 to 1.7.30.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.29...v1.7.30)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-version: 1.7.30
  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>
@dependabot
🌱 Bump github.com/BurntSushi/toml from 1.5.0 to 1.6.0 (#2422)
4c38f19 
Bumps [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/BurntSushi/toml/releases)
- [Commits](BurntSushi/toml@v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/BurntSushi/toml
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
🌱 Bump mkdocs-material from 9.7.0 to 9.7.1 (#2423)
bb38c15 
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.7.0 to 9.7.1.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.7.0...9.7.1)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-version: 9.7.1
  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>
@dependabot
🌱 Bump soupsieve from 2.8 to 2.8.1 (#2424)
0f92032 
Bumps [soupsieve](https://github.com/facelessuser/soupsieve) from 2.8 to 2.8.1.
- [Release notes](https://github.com/facelessuser/soupsieve/releases)
- [Commits](facelessuser/soupsieve@2.8...2.8.1)

---
updated-dependencies:
- dependency-name: soupsieve
  dependency-version: 2.8.1
  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>
@pedjak pedjak force-pushed the synchronize-upstream branch from b261917 to d8f425e Compare January 12, 2026 14:29
@pedjak
Copy link
Contributor Author

pedjak commented Jan 12, 2026

/test openshift-e2e-aws

@pedjak
Copy link
Contributor Author

pedjak commented Jan 12, 2026

/test e2e-aws-olmv1-ext

@pedjak
Copy link
Contributor Author

pedjak commented Jan 12, 2026

/test e2e-aws-techpreview-olmv1-ext

@pedjak
UPSTREAM: <carry>: Use oc client for running e2e tests
9fbe333 
Expose docker-registry to e2e test code by creating Openshift route
@pedjak pedjak force-pushed the synchronize-upstream branch from 822c3c5 to 9fbe333 Compare January 13, 2026 09:51
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@pedjak: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

@pedjak pedjak changed the title WIP Synchronize upstream + fixing e2e tests NO-ISSUE: Synchronize From Upstream Repositories Jan 13, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 13, 2026
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 13, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 13, 2026

@pedjak: This pull request explicitly references no jira issue.

Details

In response to this:

  • Change the experimental-e2e to use a two-node kind cluster (#2382)
  • Move the kind configs into a subdirectory (#2384)
  • 🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
  • 🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
  • Migrate e2e tests to Godog BDD framework (#2365)
  • Update goreleaser to v2.11.2 (#2390)
  • Updating docs strings for API go definitions (#2359)
  • 🌱 Bump golang.org/x/sync from 0.18.0 to 0.19.0 (#2391)
  • 🌱 Bump github.com/spf13/cobra from 1.10.1 to 1.10.2 (#2392)
  • Update using bingo golang-ci from v2.6.2 to v2.7.2 (#2395)
  • 🌱 Bump platformdirs from 4.5.0 to 4.5.1 (#2397)
  • Update go version to 1.25.3 (#2400)
  • Migrate E2e NetworkPolicy tests to static analysis with kube-score and conftest (#2393)
  • Add CLAUDE command and new check to review and lint the API changes (#2399)
  • 🌱 Bump pymdown-extensions from 10.17.2 to 10.18 (#2401)
  • 🌱 Bump github.com/cert-manager/cert-manager (#2403)
  • 🌱 Bump urllib3 from 2.6.0 to 2.6.1 (#2406)
  • 🌱 Bump golang.org/x/mod from 0.30.0 to 0.31.0 (#2404)
  • 🌱 Bump golang.org/x/tools from 0.39.0 to 0.40.0 (#2405)
  • Add camilamacedo86 to approvers (#2408)
  • 🌱 Bump github.com/operator-framework/api from 0.36.0 to 0.37.0 (#2414)
  • 🌱 Bump codecov/codecov-action from 5.5.1 to 5.5.2 (#2412)
  • 🌱 Bump helm.sh/helm/v3 from 3.19.3 to 3.19.4 (#2415)
  • 🌱 Bump urllib3 from 2.6.1 to 2.6.2 (#2416)
  • 🌱 Bump pymdown-extensions from 10.18 to 10.19 (#2417)
  • 🌱 Bump pymdown-extensions from 10.19 to 10.19.1 (#2419)
  • 🌱 Bump github.com/containerd/containerd from 1.7.29 to 1.7.30 (#2421)
  • 🌱 Bump github.com/BurntSushi/toml from 1.5.0 to 1.6.0 (#2422)
  • 🌱 Bump mkdocs-material from 9.7.0 to 9.7.1 (#2423)
  • 🌱 Bump soupsieve from 2.8 to 2.8.1 (#2424)
  • Fix unaddressed comments on PR #2393 (#2402)
  • Upgrade controller-gen from v0.19.0 to v0.20.0 (#2425)
  • 🌱 Bump actions/upload-artifact from 5 to 6 (#2418)
  • Fix command and shell consider fixed sceanrios (#2410)
  • (fix) Api documentation (#2409)
  • 🌱 [Updated] Bump sigs.k8s.io/controller-tools from 0.19.0 to 0.20.0 in the k8s-dependencies group (#2427)
  • Promote Single Own Feature Gate AND Config spec in the CR to GA (#2428)
  • standardizing approach for required-tests-with-occasional-overrides (#2431)
  • 📖 Clarify install mode docs (#2430)
  • Fix ClusterCatalog Priority field validation markers (#2432)
  • UPSTREAM: : Add OpenShift specific files
  • UPSTREAM: : Add new tests for single/own namespaces install modes
  • UPSTREAM: : Upgrade OCP image from 4.20 to 4.21
  • UPSTREAM: : [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
  • UPSTREAM: : Update OCP catalogs to v4.21
  • UPSTREAM: : support singleown cases in disconnected
  • UPSTREAM: : fix cases 81696 and 74618 for product code changes
  • UPSTREAM: : Define Default timeouts and apply their usage accross to avoid flakes
  • UPSTREAM: : Update to new feature-gate options in helm
  • UPSTREAM: : Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
  • UPSTREAM: : [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
  • UPSTREAM: : Update OwnSingle template to use spec.config.inline.watchNamespace
  • UPSTREAM: : [OTE]: Add webhook cleanup validation on extension uninstall
  • UPSTREAM: : Add [OTP] to migrated cases
  • UPSTREAM: : [OTE]: Upgrade dependencies used
  • UPSTREAM: : fix(OTE): fix OpenShift Kubernetes replace version format
  • UPSTREAM: : [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
  • UPSTREAM: : add disconnected environment support with custom prow job for migrated qe cases
  • UPSTREAM: : migrate jiazha test cases to OTE
  • UPSTREAM: : migrate clustercatalog case to ote
  • UPSTREAM: : migrate olmv1 QE stress cases
  • UPSTREAM: : Use busybox/httpd to simulate probes
  • UPSTREAM: : migrate olmv1 QE cases
  • UPSTREAM: : add agent for olmv1 qe cases
  • UPSTREAM: : Disable upstream PodDisruptionBudget
  • UPSTREAM: : Add AGENTS.md for AI code contributions
  • UPSTREAM: : address review comments through addl prompts
  • UPSTREAM: : addressing some more review comments
  • UPSTREAM: : remove DCO line
  • UPSTREAM: : migrate bandrade test cases to OTE
  • UPSTREAM: : update metadata
  • UPSTREAM: : remove originalName
  • UPSTREAM: : update 80458's timeout to 180s
  • UPSTREAM: : update 83026 to specify the clustercatalog
  • UPSTREAM: : Update to golang 1.25 and ocp 4.22
  • UPSTREAM: : go mod vendor
  • UPSTREAM: : remove upstream GitHub configuration
  • UPSTREAM: : configure the commit-checker
  • Use oc client and skip tests as before

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.

@ehearne-redhat ehearne-redhat mentioned this pull request Jan 13, 2026
Merged
@tmshort
Copy link
Contributor

tmshort commented Jan 13, 2026

/approve

@tmshort
Copy link
Contributor

tmshort commented Jan 13, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 13, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pedjak, 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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 13, 2026
@tmshort
Copy link
Contributor

tmshort commented Jan 13, 2026

/label tide/merge-method-merge

@openshift-ci openshift-ci bot added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Jan 13, 2026
@tmshort tmshort mentioned this pull request Jan 13, 2026
Merged
@bandrade
Copy link
Contributor

bandrade commented Jan 13, 2026

/label qe-approved
/verified by @bandrade

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 13, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 13, 2026

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

Details

In response to this:

/label qe-approved
/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.

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 13, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 13, 2026

@pedjak: This pull request explicitly references no jira issue.

Details

In response to this:

This PR replaces #582 and should be merged instead because it contains the commit that fixes upstream e2e test execution.

  • Change the experimental-e2e to use a two-node kind cluster (#2382)
  • Move the kind configs into a subdirectory (#2384)
  • 🌱 Bump beautifulsoup4 from 4.14.2 to 4.14.3 (#2388)
  • 🌱 Bump github.com/klauspost/compress from 1.18.1 to 1.18.2 (#2387)
  • Migrate e2e tests to Godog BDD framework (#2365)
  • Update goreleaser to v2.11.2 (#2390)
  • Updating docs strings for API go definitions (#2359)
  • 🌱 Bump golang.org/x/sync from 0.18.0 to 0.19.0 (#2391)
  • 🌱 Bump github.com/spf13/cobra from 1.10.1 to 1.10.2 (#2392)
  • Update using bingo golang-ci from v2.6.2 to v2.7.2 (#2395)
  • 🌱 Bump platformdirs from 4.5.0 to 4.5.1 (#2397)
  • Update go version to 1.25.3 (#2400)
  • Migrate E2e NetworkPolicy tests to static analysis with kube-score and conftest (#2393)
  • Add CLAUDE command and new check to review and lint the API changes (#2399)
  • 🌱 Bump pymdown-extensions from 10.17.2 to 10.18 (#2401)
  • 🌱 Bump github.com/cert-manager/cert-manager (#2403)
  • 🌱 Bump urllib3 from 2.6.0 to 2.6.1 (#2406)
  • 🌱 Bump golang.org/x/mod from 0.30.0 to 0.31.0 (#2404)
  • 🌱 Bump golang.org/x/tools from 0.39.0 to 0.40.0 (#2405)
  • Add camilamacedo86 to approvers (#2408)
  • 🌱 Bump github.com/operator-framework/api from 0.36.0 to 0.37.0 (#2414)
  • 🌱 Bump codecov/codecov-action from 5.5.1 to 5.5.2 (#2412)
  • 🌱 Bump helm.sh/helm/v3 from 3.19.3 to 3.19.4 (#2415)
  • 🌱 Bump urllib3 from 2.6.1 to 2.6.2 (#2416)
  • 🌱 Bump pymdown-extensions from 10.18 to 10.19 (#2417)
  • 🌱 Bump pymdown-extensions from 10.19 to 10.19.1 (#2419)
  • 🌱 Bump github.com/containerd/containerd from 1.7.29 to 1.7.30 (#2421)
  • 🌱 Bump github.com/BurntSushi/toml from 1.5.0 to 1.6.0 (#2422)
  • 🌱 Bump mkdocs-material from 9.7.0 to 9.7.1 (#2423)
  • 🌱 Bump soupsieve from 2.8 to 2.8.1 (#2424)
  • Fix unaddressed comments on PR #2393 (#2402)
  • Upgrade controller-gen from v0.19.0 to v0.20.0 (#2425)
  • 🌱 Bump actions/upload-artifact from 5 to 6 (#2418)
  • Fix command and shell consider fixed sceanrios (#2410)
  • (fix) Api documentation (#2409)
  • 🌱 [Updated] Bump sigs.k8s.io/controller-tools from 0.19.0 to 0.20.0 in the k8s-dependencies group (#2427)
  • Promote Single Own Feature Gate AND Config spec in the CR to GA (#2428)
  • standardizing approach for required-tests-with-occasional-overrides (#2431)
  • 📖 Clarify install mode docs (#2430)
  • Fix ClusterCatalog Priority field validation markers (#2432)
  • UPSTREAM: : Add OpenShift specific files
  • UPSTREAM: : Add new tests for single/own namespaces install modes
  • UPSTREAM: : Upgrade OCP image from 4.20 to 4.21
  • UPSTREAM: : [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
  • UPSTREAM: : Update OCP catalogs to v4.21
  • UPSTREAM: : support singleown cases in disconnected
  • UPSTREAM: : fix cases 81696 and 74618 for product code changes
  • UPSTREAM: : Define Default timeouts and apply their usage accross to avoid flakes
  • UPSTREAM: : Update to new feature-gate options in helm
  • UPSTREAM: : Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
  • UPSTREAM: : [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
  • UPSTREAM: : Update OwnSingle template to use spec.config.inline.watchNamespace
  • UPSTREAM: : [OTE]: Add webhook cleanup validation on extension uninstall
  • UPSTREAM: : Add [OTP] to migrated cases
  • UPSTREAM: : [OTE]: Upgrade dependencies used
  • UPSTREAM: : fix(OTE): fix OpenShift Kubernetes replace version format
  • UPSTREAM: : [Default Catalog Tests] Upgrade go 1.24.6 and dependencies
  • UPSTREAM: : add disconnected environment support with custom prow job for migrated qe cases
  • UPSTREAM: : migrate jiazha test cases to OTE
  • UPSTREAM: : migrate clustercatalog case to ote
  • UPSTREAM: : migrate olmv1 QE stress cases
  • UPSTREAM: : Use busybox/httpd to simulate probes
  • UPSTREAM: : migrate olmv1 QE cases
  • UPSTREAM: : add agent for olmv1 qe cases
  • UPSTREAM: : Disable upstream PodDisruptionBudget
  • UPSTREAM: : Add AGENTS.md for AI code contributions
  • UPSTREAM: : address review comments through addl prompts
  • UPSTREAM: : addressing some more review comments
  • UPSTREAM: : remove DCO line
  • UPSTREAM: : migrate bandrade test cases to OTE
  • UPSTREAM: : update metadata
  • UPSTREAM: : remove originalName
  • UPSTREAM: : update 80458's timeout to 180s
  • UPSTREAM: : update 83026 to specify the clustercatalog
  • UPSTREAM: : Update to golang 1.25 and ocp 4.22
  • UPSTREAM: : go mod vendor
  • UPSTREAM: : remove upstream GitHub configuration
  • UPSTREAM: : configure the commit-checker
  • Use oc client and skip tests as before

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

@openshift-merge-bot openshift-merge-bot bot merged commit 759d2d1 into openshift:main Jan 13, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtfranz dtfranz Awaiting requested review from dtfranz

@trgeiger trgeiger Awaiting requested review from trgeiger

2 more reviewers

@camilamacedo86 camilamacedo86 camilamacedo86 left review comments

@tmshort tmshort tmshort left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@tmshort tmshort

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.