Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-bot wants to merge 101 commits into
base: main
Choose a base branch
from
Open

NO-ISSUE: Synchronize From Upstream Repositories #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
dedc766
:seedling: Bump github.com/operator-framework/operator-registry (#2689)
dependabot[bot] May 7, 2026
7d80a95
:seedling: Bump idna from 3.11 to 3.12 (#2690)
dependabot[bot] May 7, 2026
6e39708
:seedling: Bump certifi from 2026.2.25 to 2026.4.22 (#2691)
dependabot[bot] May 7, 2026
cb369e4
:seedling: Bump click from 8.3.2 to 8.3.3 (#2692)
dependabot[bot] May 8, 2026
a9a7909
:seedling: Bump idna from 3.12 to 3.13 (#2693)
dependabot[bot] May 8, 2026
38a6775
:seedling: Bump pathspec from 1.0.4 to 1.1.0 (#2694)
dependabot[bot] May 8, 2026
869124a
use AlwaysAllow UnhealthyPodEvictionPolicy option in PDBs (#2688)
atiratree May 8, 2026
b09d0a8
Merge branch 'main' into synchronize
May 9, 2026
06cb6f4
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
e5008b7
UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
camilamacedo86 Oct 6, 2025
4643c4a
UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
camilamacedo86 Oct 13, 2025
8b6ef21
UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp …
camilamacedo86 Oct 13, 2025
92b9535
UPSTREAM: <carry>: Update OCP catalogs to v4.21
tmshort Oct 13, 2025
296c5cb
UPSTREAM: <carry>: support singleown cases in disconnected
kuiwang02 Oct 16, 2025
ccf6b6b
UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
kuiwang02 Oct 17, 2025
aff05b7
UPSTREAM: <carry>: Define Default timeouts and apply their usage accr…
camilamacedo86 Oct 22, 2025
86f57ec
UPSTREAM: <carry>: Update to new feature-gate options in helm
tmshort Oct 22, 2025
350143b
UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniq…
camilamacedo86 Oct 22, 2025
58202fe
UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comme…
camilamacedo86 Oct 24, 2025
6986bd8
UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inlin…
kuiwang02 Nov 3, 2025
5ce0bd5
UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension…
camilamacedo86 Nov 4, 2025
b36cff3
UPSTREAM: <carry>: Add [OTP] to migrated cases
kuiwang02 Nov 7, 2025
3a401fa
UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
camilamacedo86 Nov 5, 2025
4d03dc6
UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version…
camilamacedo86 Nov 10, 2025
6562eea
UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and depe…
camilamacedo86 Nov 11, 2025
cc72cce
UPSTREAM: <carry>: add disconnected environment support with custom p…
kuiwang02 Nov 12, 2025
3f6131a
UPSTREAM: <carry>: migrate jiazha test cases to OTE
jianzhangbjz Nov 14, 2025
00882e8
UPSTREAM: <carry>: migrate clustercatalog case to ote
Xia-Zhao-rh Oct 17, 2025
348bf10
UPSTREAM: <carry>: migrate olmv1 QE stress cases
kuiwang02 Nov 20, 2025
d48add2
UPSTREAM: <carry>: Use busybox/httpd to simulate probes
tmshort Nov 25, 2025
1a7fd85
UPSTREAM: <carry>: migrate olmv1 QE cases
Xia-Zhao-rh Nov 25, 2025
aa10085
UPSTREAM: <carry>: add agent for olmv1 qe cases
kuiwang02 Oct 21, 2025
c2ad15a
UPSTREAM: <carry>: Disable upstream PodDisruptionBudget
tmshort Dec 3, 2025
898cbb3
UPSTREAM: <carry>: Add AGENTS.md for AI code contributions
rashmigottipati Dec 11, 2025
ba39584
UPSTREAM: <carry>: address review comments through addl prompts
rashmigottipati Dec 11, 2025
a922706
UPSTREAM: <carry>: addressing some more review comments
rashmigottipati Dec 11, 2025
0f0fb2e
UPSTREAM: <carry>: remove DCO line
rashmigottipati Dec 11, 2025
2d78f94
UPSTREAM: <carry>: migrate bandrade test cases to OTE
bandrade Nov 18, 2025
69465fe
UPSTREAM: <carry>: update metadata
bandrade Dec 3, 2025
8852ed1
UPSTREAM: <carry>: remove originalName
bandrade Dec 3, 2025
847d9e1
UPSTREAM: <carry>: update 80458's timeout to 180s
jianzhangbjz Dec 8, 2025
75ae8f7
UPSTREAM: <carry>: update 83026 to specify the clustercatalog
jianzhangbjz Dec 15, 2025
a34c5f1
UPSTREAM: <carry>: Update to golang 1.25 and ocp 4.22
oceanc80 Dec 18, 2025
460604e
UPSTREAM: <carry>: Use oc client for running e2e tests
pedjak Jan 13, 2026
5a3bc40
UPSTREAM: <carry>: Run upstream e2e tests tagged with `@catalogd-update`
pedjak Jan 14, 2026
6d0ece1
UPSTREAM: <carry>: enhance case to make it more stable
kuiwang02 Jan 6, 2026
a34a967
UPSTREAM: <carry>: add service account to curl job
ehearne-redhat Jan 7, 2026
f1f88e3
UPSTREAM: <carry>: move sa creation out of buildCurlJob()
ehearne-redhat Jan 8, 2026
5b1511b
UPSTREAM: <carry>: comment out delete service account
ehearne-redhat Jan 9, 2026
07fc47f
UPSTREAM: <carry>: move defercleanup for sa for LIFO
ehearne-redhat Jan 9, 2026
a712a5e
UPSTREAM: <carry>: add polling so job fully deleted before proceed
ehearne-redhat Jan 12, 2026
f77fa2d
UPSTREAM: <carry>: Revert "Merge pull request #594 from ehearne-redha…
sosiouxme Jan 20, 2026
0b86093
UPSTREAM: <carry>: Remove openshift-redhat-marketplace catalog tests
camilamacedo86 Jan 8, 2026
ddb66a4
UPSTREAM: <carry>: config watchnamespace cases
kuiwang02 Jan 6, 2026
a5da19b
UPSTREAM: <carry>: enhance ocp-79770
Xia-Zhao-rh Jan 26, 2026
77f14ef
UPSTREAM: <carry>: upgrade version support case
kuiwang02 Jan 28, 2026
3d3caeb
UPSTREAM: <carry>: Remove installed condition check from auth preflig…
Jan 30, 2026
710a909
UPSTREAM: <carry>: Add openshift/api dependency
Jan 30, 2026
be2f181
UPSTREAM: <carry>: Add boxcutter specific preflight auth test
Jan 30, 2026
41657cc
UPSTREAM: <carry>: adjust watchnamespace case based on change
kuiwang02 Feb 2, 2026
97a74cc
UPSTREAM: <carry>: fix(ote): Use as operator-controller dep from root…
camilamacedo86 Feb 3, 2026
656c592
UPSTREAM: <carry>: add 83979 automation
bandrade Feb 2, 2026
cca401e
UPSTREAM: <carry>: add 85889 automation
bandrade Feb 2, 2026
f67671b
UPSTREAM: <carry>: Update test-operator startup script to fix pod pro…
Feb 4, 2026
d1f5a41
UPSTREAM: <carry>: Fix up own-namespace invalid configuration test
Feb 7, 2026
4d4dbff
UPSTREAM: <carry>: Preflight tests use in-cluster catalog and bundles…
camilamacedo86 Feb 24, 2026
850fbfe
UPSTREAM: <carry>: adjust sa and permission test cases per new change…
kuiwang02 Feb 2, 2026
d3ed2f7
UPSTREAM: <carry>: Update OCP catalogs to v4.22
camilamacedo86 Feb 3, 2026
47adb8d
UPSTREAM: <carry>: chore(OTE and Default Catalog Tests) Update go and…
camilamacedo86 Feb 26, 2026
677b5d1
UPSTREAM: <carry>: fix 83026 for TP cluster
jianzhangbjz Feb 28, 2026
3fafe38
UPSTREAM: <carry>: serviceAccount validation unified across all runtimes
kuiwang02 Mar 6, 2026
2de6d39
UPSTREAM: <carry>: Fix OLMv1 test operator to listen on IPv6
stbenjam Mar 6, 2026
54bbdad
UPSTREAM: <carry>: Increase install timeout and add diagnostic loggin…
camilamacedo86 Mar 11, 2026
6423ffa
UPSTREAM: <carry>: add service account to curl job
ehearne-redhat Mar 2, 2026
86341c8
UPSTREAM: <carry>: update OCP-75441 to support multi-arch
jianzhangbjz Mar 19, 2026
442e0e4
UPSTREAM: <carry>: deployment config cases
kuiwang02 Feb 6, 2026
9bd7d1a
UPSTREAM: <carry>: Add OTE tests for OLMv1 DeploymentConfig support
tmshort Mar 11, 2026
7add8f2
UPSTREAM: <carry>: Update openshift/api and client-go
tmshort Mar 19, 2026
783132f
UPSTREAM: <carry>: Add boxcutter tests
camilamacedo86 Mar 23, 2026
5f3ed53
UPSTREAM: <carry>: enhance QE cases
Xia-Zhao-rh Mar 17, 2026
dd38969
UPSTREAM: <carry>: Update quay-operator version to one containing arm…
dtfranz Mar 24, 2026
557f3b0
UPSTREAM: <carry>: verify volume/volumeMount override
kuiwang02 Mar 25, 2026
cb713ae
UPSTREAM: <carry>: Add long-duration test script and documents
jianzhangbjz Mar 11, 2026
a355516
UPSTREAM: <carry>: Update grpc in default-catalog-consistency tests
tmshort Mar 27, 2026
91f231b
UPSTREAM: <carry>: Rename ClusterExtensionRevision to ClusterObjectSe…
camilamacedo86 Mar 31, 2026
c293b32
UPSTREAM: <carry>: Skip incompatible operator test when Boxcutter use…
camilamacedo86 Mar 31, 2026
62629d5
UPSTREAM: <carry>: add ocp-87557
bandrade Feb 8, 2026
d1a6d31
UPSTREAM: <carry>: Add fgiudici as reviewer
fgiudici Mar 31, 2026
01a8f64
UPSTREAM: <carry>: Remove skip for incompatible operator check after …
camilamacedo86 Apr 1, 2026
a85bf42
UPSTREAM: <carry>: Test empty affinity erasure and cleanup
kuiwang02 Apr 1, 2026
b8e4d24
UPSTREAM: <carry>: Fix boxcutter finalizer ResourceNames in prefligh…
camilamacedo86 Apr 9, 2026
cabba14
UPSTREAM: <carry>: Expand OTE docs with more comprehensive details
camilamacedo86 Apr 15, 2026
34553e8
UPSTREAM: <carry>: Disable upstream TLSProfile tests
tmshort Apr 18, 2026
3640c9f
UPSTREAM: <carry>: OTE: Simplify by remove option to configure tests …
camilamacedo86 Apr 20, 2026
7500554
UPSTREAM: <carry>: OTE - Make OTE local output easier to read
camilamacedo86 Apr 21, 2026
d408ddd
UPSTREAM: <carry>: remove dead e2e registry push job and related vari…
joelanford Apr 29, 2026
dba80e0
UPSTREAM: <carry>: OCPBUGS-62517: Set replicas=1, PDB, and pod anti-a…
tmshort Apr 23, 2026
5f34638
UPSTREAM: <carry>: fix(test): drop blocking namespace-deletion wait b…
tmshort May 4, 2026
56337bd
UPSTREAM: <drop>: go mod vendor
May 9, 2026
f127e65
UPSTREAM: <drop>: remove upstream GitHub configuration
May 9, 2026
841b0cc
UPSTREAM: <drop>: configure the commit-checker
May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/opencontainers/image-spec v1.1.1
github.com/operator-framework/api v0.42.0
github.com/operator-framework/helm-operator-plugins v0.8.0
github.com/operator-framework/operator-registry v1.65.0
github.com/operator-framework/operator-registry v1.66.0
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/common v0.67.5
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
Expand All @@ -35,13 +35,13 @@ require (
golang.org/x/sync v0.20.0
golang.org/x/tools v0.44.0
helm.sh/helm/v3 v3.20.2
k8s.io/api v0.35.3
k8s.io/apiextensions-apiserver v0.35.3
k8s.io/apimachinery v0.35.3
k8s.io/apiserver v0.35.3
k8s.io/api v0.35.4
k8s.io/apiextensions-apiserver v0.35.4
k8s.io/apimachinery v0.35.4
k8s.io/apiserver v0.35.4
Comment on lines +38 to +41
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot May 8, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Verify require/replace mismatches for the bumped k8s modules in go.mod
set -euo pipefail

mods=(
  "k8s.io/api"
  "k8s.io/apiextensions-apiserver"
  "k8s.io/apimachinery"
  "k8s.io/apiserver"
  "k8s.io/component-base"
)

for m in "${mods[@]}"; do
  echo "=== $m ==="
  rg -nP "^\s*${m}\s+v" go.mod
  rg -nP "^\s*replace\s+${m}\s+=>\s+${m}\s+v" go.mod
  echo
done

Repository: openshift/operator-framework-operator-controller

Length of output: 716

k8s.io/* patch bumps to v0.35.4 are overridden by replace directives pinning v0.35.0.

The require updates are ineffective because replace directives take precedence in Go module resolution. This prevents the intended patch fixes from being applied at build time.

🔧 Proposed fix 
-replace k8s.io/api => k8s.io/api v0.35.0
+replace k8s.io/api => k8s.io/api v0.35.4

-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.0
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.4

-replace k8s.io/apimachinery => k8s.io/apimachinery v0.35.0
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.35.4

-replace k8s.io/apiserver => k8s.io/apiserver v0.35.0
+replace k8s.io/apiserver => k8s.io/apiserver v0.35.4

-replace k8s.io/component-base => k8s.io/component-base v0.35.0
+replace k8s.io/component-base => k8s.io/component-base v0.35.4

Also applies to: 44-44

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@go.mod` around lines 38 - 41, The go.mod requires list upgrades k8s.io/api,
k8s.io/apiextensions-apiserver, k8s.io/apimachinery and k8s.io/apiserver to
v0.35.4 but those are being overridden by existing replace directives that pin
them to v0.35.0; locate the replace entries that reference the k8s.io modules
and either update their versions to v0.35.4 (match the require) or remove the
replace lines so the require versions take precedence, then run go mod tidy (or
go get k8s.io/...@v0.35.4) to verify the module graph is updated.

k8s.io/cli-runtime v0.35.1
k8s.io/client-go v1.5.2
k8s.io/component-base v0.35.3
k8s.io/component-base v0.35.4
k8s.io/klog/v2 v2.140.0
k8s.io/kubernetes v1.35.0
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
Expand Down Expand Up @@ -97,7 +97,7 @@ require (
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v29.4.0+incompatible // indirect
github.com/docker/cli v29.4.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v28.5.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.5 // indirect
Expand Down Expand Up @@ -145,7 +145,7 @@ require (
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/h2non/filetype v1.1.3 // indirect
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -167,7 +167,7 @@ require (
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/mattn/go-sqlite3 v1.14.37 // indirect
github.com/mattn/go-sqlite3 v1.14.42 // indirect
github.com/miekg/pkcs11 v1.1.2 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand Down Expand Up @@ -218,15 +218,15 @@ require (
go.etcd.io/bbolt v1.4.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
go.podman.io/common v0.67.0 // indirect
go.podman.io/common v0.67.1 // indirect
go.podman.io/storage v1.62.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
Expand All @@ -239,9 +239,9 @@ require (
golang.org/x/time v0.15.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
100 changes: 50 additions & 50 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
{{- if .Values.options.catalogd.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ .Values.options.catalogd.podDisruptionBudget.maxUnavailable }}
{{- end }}
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand Down
1 change: 1 addition & 0 deletions helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
{{- if .Values.options.operatorController.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ .Values.options.operatorController.podDisruptionBudget.maxUnavailable }}
{{- end }}
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/experimental-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/standard-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: standard-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: standard-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: standard
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: standard
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
22 changes: 11 additions & 11 deletions openshift/tests-extension/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ require (
github.com/tidwall/gjson v1.18.0
github.com/tidwall/pretty v1.2.1
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.35.3
k8s.io/apiextensions-apiserver v0.35.3
k8s.io/apimachinery v0.35.3
k8s.io/apiserver v0.35.3
k8s.io/api v0.35.4
k8s.io/apiextensions-apiserver v0.35.4
k8s.io/apimachinery v0.35.4
k8s.io/apiserver v0.35.4
k8s.io/client-go v1.5.2
k8s.io/kubernetes v1.35.0
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
Expand Down Expand Up @@ -64,7 +64,7 @@ require (
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand All @@ -83,10 +83,10 @@ require (
github.com/tidwall/match v1.1.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
Expand All @@ -103,14 +103,14 @@ require (
golang.org/x/text v0.36.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.44.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.35.3 // indirect
k8s.io/component-base v0.35.4 // indirect
k8s.io/component-helpers v0.35.0 // indirect
k8s.io/controller-manager v0.33.2 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
Expand Down
28 changes: 14 additions & 14 deletions openshift/tests-extension/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 h1:X+2YciYSxvMQK0UZ7sg45ZVabVZBeBuvMkmuI2V3Fak=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7/go.mod h1:lW34nIZuQ8UDPdkon5fmfp2l3+ZkQ2me/+oecHYLOII=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
Expand Down Expand Up @@ -198,14 +198,14 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0/go.mod h1:bTdK1nhqF76qiPoCCdyFIV+N/sRHYXYCTQc+3VCi3MI=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 h1:DvJDOPmSWQHWywQS6lKL+pb8s3gBLOZUtw4N+mavW1I=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0/go.mod h1:EtekO9DEJb4/jRyN4v4Qjc2yA7AtfCBuz2FynRUWTXs=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0/go.mod h1:J2pvYM5NGHofZ2/Ru6zw/TNWnEQp5crgyDeSrYpXkAw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 h1:zWWrB1U6nqhS/k6zYB74CjRpuiitRtLLi68VcgmOEto=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0/go.mod h1:2qXPNBX1OVRC0IwOnfo1ljoid+RD0QK3443EaqVlsOU=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
Expand Down Expand Up @@ -271,14 +271,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 h1:JLQynH/LBHfCTSbDWl+py8C+Rg/k1OVH3xfcaiANuF0=
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:kSJwQxqmFXeo79zOmbrALdflXQeAYcUbgS7PbpMknCY=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4=
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 h1:ndE4FoJqsIceKP2oYSnUZqhTdYufCYYkqwtFzfrhI7w=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
4 changes: 3 additions & 1 deletion ...shift/tests-extension/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/handler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions openshift/tests-extension/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ...-extension/vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 11 additions & 15 deletions ...extension/vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion ...etry.io/contrib/instrumentation/net/http/otelhttp/internal/request/resp_writer_wrapper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading