Skip to content

Commit 251d9b0

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #677 from openshift-bot/synchronize-upstream
OCPBUGS-78311, OCPBUGS-78092: Synchronize From Upstream Repositories
2 parents e78e42d + 172d4a5 commit 251d9b0

233 files changed

Lines changed: 39339 additions & 2067 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CATD_IMG := $(CATD_IMAGE_REPO):$(IMAGE_TAG)
3434

3535
# Extract Kubernetes client-go version used to set the version to the PSA labels, for ENVTEST and KIND
3636
ifeq ($(origin K8S_VERSION), undefined)
37-
K8S_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed -E 's/^v0\.([0-9]+)\.[0-9]+$$/1.\1/')
37+
K8S_VERSION := $(shell go list -m k8s.io/client-go | awk '{print $$NF}' | sed -E 's/^v0\.([0-9]+)\.[0-9]+$$/1.\1/')
3838
endif
3939

4040
# Ensure ENVTEST_VERSION follows correct "X.Y.x" format

‎api/v1/clusterextensionrevision_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ const (
227227
type ProbeType string
228228

229229
const (
230-
ProbeTypeFieldCondition ProbeType = "ConditionEqual"
231-
ProbeTypeFieldEqual ProbeType = "FieldsEqual"
230+
ProbeTypeConditionEqual ProbeType = "ConditionEqual"
231+
ProbeTypeFieldsEqual ProbeType = "FieldsEqual"
232232
ProbeTypeFieldValue ProbeType = "FieldValue"
233233
)
234234

‎commitchecker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
expectedMergeBase: c16a97bc1853e36955b4e1825b8e8ecea565f69a
1+
expectedMergeBase: 253feaef5babbdabfb4b63d1cb3a60455947be3a
22
upstreamBranch: main
33
upstreamOrg: operator-framework
44
upstreamRepo: operator-controller

‎docs/tutorials/install-extension.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ For information on determining the ServiceAccount's permission, please see [Deri
4646
sourceType: Catalog
4747
catalog:
4848
packageName: <package_name>
49-
channels: [<channel1>,<channel2]
49+
channels: [<channel1>, <channel2>]
5050
version: "<version>"
5151
```
5252

‎go.mod‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/BurntSushi/toml v1.6.0
77
github.com/Masterminds/semver/v3 v3.4.0
88
github.com/blang/semver/v4 v4.0.0
9-
github.com/cert-manager/cert-manager v1.19.4
9+
github.com/cert-manager/cert-manager v1.20.0
1010
github.com/containerd/containerd v1.7.30
1111
github.com/cucumber/godog v0.15.1
1212
github.com/evanphx/json-patch v5.9.11+incompatible
@@ -33,20 +33,20 @@ require (
3333
golang.org/x/exp v0.0.0-20260209203927-2842357ff358
3434
golang.org/x/mod v0.34.0
3535
golang.org/x/sync v0.20.0
36-
golang.org/x/tools v0.42.0
37-
helm.sh/helm/v3 v3.20.0
38-
k8s.io/api v0.35.1
39-
k8s.io/apiextensions-apiserver v0.35.1
40-
k8s.io/apimachinery v0.35.1
41-
k8s.io/apiserver v0.35.1
42-
k8s.io/cli-runtime v0.35.0
43-
k8s.io/client-go v0.35.1
44-
k8s.io/component-base v0.35.1
36+
golang.org/x/tools v0.43.0
37+
helm.sh/helm/v3 v3.20.1
38+
k8s.io/api v0.35.3
39+
k8s.io/apiextensions-apiserver v0.35.3
40+
k8s.io/apimachinery v0.35.3
41+
k8s.io/apiserver v0.35.2
42+
k8s.io/cli-runtime v0.35.1
43+
k8s.io/client-go v1.5.2
44+
k8s.io/component-base v0.35.2
4545
k8s.io/klog/v2 v2.140.0
4646
k8s.io/kubernetes v1.35.0
47-
k8s.io/utils v0.0.0-20260108192941-914a6e750570
48-
pkg.package-operator.run/boxcutter v0.11.0
49-
sigs.k8s.io/controller-runtime v0.23.1
47+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
48+
pkg.package-operator.run/boxcutter v0.12.0
49+
sigs.k8s.io/controller-runtime v0.23.3
5050
sigs.k8s.io/controller-tools v0.20.1
5151
sigs.k8s.io/crdify v0.5.0
5252
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
@@ -55,7 +55,7 @@ require (
5555

5656
require (
5757
k8s.io/component-helpers v0.35.0 // indirect
58-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
58+
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect
5959
)
6060

6161
require (
@@ -115,20 +115,20 @@ require (
115115
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
116116
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
117117
github.com/go-logr/stdr v1.2.2 // indirect
118-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
119-
github.com/go-openapi/jsonreference v0.21.4 // indirect
120-
github.com/go-openapi/swag v0.25.4 // indirect
121-
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
122-
github.com/go-openapi/swag/conv v0.25.4 // indirect
123-
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
124-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
125-
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
126-
github.com/go-openapi/swag/loading v0.25.4 // indirect
127-
github.com/go-openapi/swag/mangling v0.25.4 // indirect
128-
github.com/go-openapi/swag/netutils v0.25.4 // indirect
129-
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
130-
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
131-
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
118+
github.com/go-openapi/jsonpointer v0.22.5 // indirect
119+
github.com/go-openapi/jsonreference v0.21.5 // indirect
120+
github.com/go-openapi/swag v0.25.5 // indirect
121+
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
122+
github.com/go-openapi/swag/conv v0.25.5 // indirect
123+
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
124+
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
125+
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
126+
github.com/go-openapi/swag/loading v0.25.5 // indirect
127+
github.com/go-openapi/swag/mangling v0.25.5 // indirect
128+
github.com/go-openapi/swag/netutils v0.25.5 // indirect
129+
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
130+
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
131+
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
132132
github.com/go-sql-driver/mysql v1.9.2 // indirect
133133
github.com/gobuffalo/flect v1.0.3 // indirect
134134
github.com/gobwas/glob v0.2.3 // indirect
@@ -193,7 +193,7 @@ require (
193193
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
194194
github.com/proglottis/gpgme v0.1.6 // indirect
195195
github.com/prometheus/client_model v0.6.2 // indirect
196-
github.com/prometheus/procfs v0.19.2 // indirect
196+
github.com/prometheus/procfs v0.20.1 // indirect
197197
github.com/rubenv/sql-migrate v1.8.1 // indirect
198198
github.com/russross/blackfriday/v2 v2.1.0 // indirect
199199
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
@@ -215,28 +215,28 @@ require (
215215
go.opencensus.io v0.24.0 // indirect
216216
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
217217
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
218-
go.opentelemetry.io/otel v1.40.0 // indirect
218+
go.opentelemetry.io/otel v1.42.0 // indirect
219219
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
220220
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
221-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
221+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
222222
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
223-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
223+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
224224
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
225225
go.podman.io/common v0.67.0 // indirect
226226
go.podman.io/storage v1.62.0 // indirect
227-
go.yaml.in/yaml/v2 v2.4.3 // indirect
227+
go.yaml.in/yaml/v2 v2.4.4 // indirect
228228
go.yaml.in/yaml/v3 v3.0.4 // indirect
229-
golang.org/x/crypto v0.48.0 // indirect
230-
golang.org/x/net v0.50.0 // indirect
231-
golang.org/x/oauth2 v0.35.0 // indirect
232-
golang.org/x/sys v0.41.0 // indirect
233-
golang.org/x/term v0.40.0 // indirect
234-
golang.org/x/text v0.34.0 // indirect
235-
golang.org/x/time v0.14.0 // indirect
229+
golang.org/x/crypto v0.49.0 // indirect
230+
golang.org/x/net v0.52.0 // indirect
231+
golang.org/x/oauth2 v0.36.0 // indirect
232+
golang.org/x/sys v0.42.0 // indirect
233+
golang.org/x/term v0.41.0 // indirect
234+
golang.org/x/text v0.35.0 // indirect
235+
golang.org/x/time v0.15.0 // indirect
236236
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
237237
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 // indirect
238238
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
239-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
239+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
240240
google.golang.org/grpc v1.79.3 // indirect
241241
google.golang.org/protobuf v1.36.11 // indirect
242242
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
@@ -245,10 +245,10 @@ require (
245245
gopkg.in/yaml.v2 v2.4.0 // indirect
246246
gopkg.in/yaml.v3 v3.0.1 // indirect
247247
k8s.io/controller-manager v0.33.2 // indirect
248-
k8s.io/kubectl v0.35.0 // indirect
248+
k8s.io/kubectl v0.35.1 // indirect
249249
oras.land/oras-go/v2 v2.6.0 // indirect
250250
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
251-
sigs.k8s.io/gateway-api v1.4.1 // indirect
251+
sigs.k8s.io/gateway-api v1.5.0 // indirect
252252
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
253253
sigs.k8s.io/kustomize/api v0.21.1 // indirect
254254
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect

0 commit comments

Comments
 (0)