Skip to content

Commit f9b661a

Browse files
acornett21grokspawn
acornett21
authored and
grokspawn
committed
updating dependencies to support k8s 1.33 (#1699)
Signed-off-by: Adam D. Cornett <[email protected]> Upstream-repository: operator-registry Upstream-commit: 53ad34f192cbe5265755ef825c18b0005bfba1a6
1 parent 1c225b3 commit f9b661a

File tree

9 files changed

+83
-86
lines changed

9 files changed

+83
-86
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ require (
240240
gopkg.in/yaml.v3 v3.0.1 // indirect
241241
k8s.io/apiextensions-apiserver v0.33.2 // indirect
242242
k8s.io/apiserver v0.33.2 // indirect
243-
k8s.io/cli-runtime v0.32.0 // indirect
243+
k8s.io/cli-runtime v0.33.2 // indirect
244244
k8s.io/component-base v0.33.2 // indirect
245245
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
246246
k8s.io/klog v1.0.0 // indirect
247247
k8s.io/klog/v2 v2.130.1 // indirect
248248
k8s.io/kms v0.33.2 // indirect
249249
k8s.io/kube-aggregator v0.33.2 // indirect
250-
k8s.io/kubectl v0.32.0 // indirect
250+
k8s.io/kubectl v0.33.2 // indirect
251251
oras.land/oras-go/v2 v2.6.0 // indirect
252252
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
253253
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,8 +1469,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
14691469
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
14701470
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
14711471
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
1472-
github.com/distribution/distribution/v3 v3.0.0-rc.3 h1:JRJso9IVLoooKX76oWR+DWCCdZlK5m4nRtDWvzB1ITg=
1473-
github.com/distribution/distribution/v3 v3.0.0-rc.3/go.mod h1:offoOgrnYs+CFwis8nE0hyzYZqRCZj5EFc5kgfszwiE=
1472+
github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=
1473+
github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
14741474
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
14751475
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
14761476
github.com/docker/cli v28.3.1+incompatible h1:ZUdwOLDEBoE3TE5rdC9IXGY5HPHksJK3M+hJEWhh2mc=
@@ -3191,8 +3191,8 @@ k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
31913191
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
31923192
k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
31933193
k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
3194-
k8s.io/cli-runtime v0.32.0 h1:dP+OZqs7zHPpGQMCGAhectbHU2SNCuZtIimRKTv2T1c=
3195-
k8s.io/cli-runtime v0.32.0/go.mod h1:Mai8ht2+esoDRK5hr861KRy6z0zHsSTYttNVJXgP3YQ=
3194+
k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
3195+
k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
31963196
k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8=
31973197
k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
31983198
k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
@@ -3225,8 +3225,8 @@ k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C
32253225
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
32263226
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
32273227
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
3228-
k8s.io/kubectl v0.32.0 h1:rpxl+ng9qeG79YA4Em9tLSfX0G8W0vfaiPVrc/WR7Xw=
3229-
k8s.io/kubectl v0.32.0/go.mod h1:qIjSX+QgPQUgdy8ps6eKsYNF+YmFOAO3WygfucIqFiE=
3228+
k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
3229+
k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
32303230
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
32313231
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
32323232
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=

‎staging/operator-registry/go.mod

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/operator-framework/operator-registry
22

3-
go 1.23.3
4-
5-
toolchain go1.23.6
3+
go 1.24.3
64

75
require (
86
github.com/akrylysov/pogreb v0.10.2
@@ -11,7 +9,7 @@ require (
119
github.com/containerd/errdefs v1.0.0
1210
github.com/containers/common v0.63.1
1311
github.com/containers/image/v5 v5.35.0
14-
github.com/distribution/distribution/v3 v3.0.0-rc.3
12+
github.com/distribution/distribution/v3 v3.0.0
1513
github.com/distribution/reference v0.6.0
1614
github.com/docker/cli v28.2.2+incompatible
1715
github.com/golang-migrate/migrate/v4 v4.18.3
@@ -47,21 +45,17 @@ require (
4745
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
4846
google.golang.org/protobuf v1.36.6
4947
gopkg.in/yaml.v2 v2.4.0
50-
k8s.io/api v0.32.3
51-
k8s.io/apiextensions-apiserver v0.32.3
52-
k8s.io/apimachinery v0.32.3
53-
k8s.io/client-go v0.32.3
54-
k8s.io/kubectl v0.32.0
48+
k8s.io/api v0.33.2
49+
k8s.io/apiextensions-apiserver v0.33.2
50+
k8s.io/apimachinery v0.33.2
51+
k8s.io/client-go v0.33.2
52+
k8s.io/kubectl v0.33.2
5553
oras.land/oras-go/v2 v2.6.0
56-
sigs.k8s.io/controller-runtime v0.20.4
54+
sigs.k8s.io/controller-runtime v0.21.0
5755
sigs.k8s.io/kind v0.29.0
5856
sigs.k8s.io/yaml v1.4.0
5957
)
6058

61-
// https://github.com/kubernetes/apiserver/issues/116
62-
// reevaluate when we bump to k8s v1.33.0
63-
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
64-
6559
require (
6660
al.essio.dev/pkg/shellescape v1.5.1 // indirect
6761
cel.dev/expr v0.23.1 // indirect
@@ -124,14 +118,13 @@ require (
124118
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
125119
github.com/golang/protobuf v1.5.4 // indirect
126120
github.com/google/cel-go v0.25.0 // indirect
127-
github.com/google/gnostic-models v0.6.8 // indirect
121+
github.com/google/gnostic-models v0.6.9 // indirect
128122
github.com/google/go-containerregistry v0.20.3 // indirect
129-
github.com/google/gofuzz v1.2.0 // indirect
130123
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
131124
github.com/google/uuid v1.6.0 // indirect
132125
github.com/gorilla/handlers v1.5.2 // indirect
133126
github.com/gorilla/mux v1.8.1 // indirect
134-
github.com/gorilla/websocket v1.5.0 // indirect
127+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
135128
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
136129
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
137130
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
@@ -167,7 +160,7 @@ require (
167160
github.com/pelletier/go-toml v1.9.5 // indirect
168161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
169162
github.com/proglottis/gpgme v0.1.4 // indirect
170-
github.com/prometheus/client_golang v1.21.1 // indirect
163+
github.com/prometheus/client_golang v1.22.0 // indirect
171164
github.com/prometheus/client_model v0.6.1 // indirect
172165
github.com/prometheus/common v0.62.0 // indirect
173166
github.com/prometheus/procfs v0.15.1 // indirect
@@ -203,7 +196,7 @@ require (
203196
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
204197
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
205198
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
206-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
199+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
207200
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
208201
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
209202
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
@@ -229,13 +222,14 @@ require (
229222
gopkg.in/inf.v0 v0.9.1 // indirect
230223
gopkg.in/warnings.v0 v0.1.2 // indirect
231224
gopkg.in/yaml.v3 v3.0.1 // indirect
232-
k8s.io/apiserver v0.32.3 // indirect
233-
k8s.io/cli-runtime v0.32.0 // indirect
234-
k8s.io/component-base v0.32.3 // indirect
225+
k8s.io/apiserver v0.33.2 // indirect
226+
k8s.io/cli-runtime v0.33.2 // indirect
227+
k8s.io/component-base v0.33.2 // indirect
235228
k8s.io/klog/v2 v2.130.1 // indirect
236-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
229+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
237230
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
238-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
231+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
239232
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
240-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
233+
sigs.k8s.io/randfill v1.0.0 // indirect
234+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
241235
)

0 commit comments

Comments
 (0)