Skip to content

Commit 8f627ea

Browse files
acornett21acornett21
committed
update dependencies to support k8s 1.33
Signed-off-by: Adam D. Cornett <adc@redhat.com>
1 parent 88f7a93 commit 8f627ea

3 files changed

Lines changed: 211 additions & 205 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ export IMAGE_VERSION = v1.40.0
99
export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
1010
export GIT_VERSION = $(shell git describe --dirty --tags --always)
1111
export GIT_COMMIT = $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.32.0
12+
export K8S_VERSION = 1.33.2
13+
export KIND_VERSION = 0.29.0
1314

1415
# Build settings
1516
export TOOLS_DIR = tools/bin
@@ -185,12 +186,12 @@ cluster-create::
185186

186187
.PHONY: dev-install
187188
dev-install::
188-
$(SCRIPTS_DIR)/fetch kind 0.24.0
189+
$(SCRIPTS_DIR)/fetch kind $(KIND_VERSION)
189190
$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
190191

191192
.PHONY: test-e2e-teardown
192193
test-e2e-teardown:
193-
$(SCRIPTS_DIR)/fetch kind 0.24.0
194+
$(SCRIPTS_DIR)/fetch kind $(KIND_VERSION)
194195
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
195196
rm -f $(KUBECONFIG)
196197

‎go.mod‎

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.3
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/fatih/structtag v1.2.0
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
99
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
1010
github.com/iancoleman/strcase v0.3.0
1111
github.com/kr/text v0.2.0
@@ -14,43 +14,39 @@ require (
1414
github.com/onsi/ginkgo/v2 v2.23.4
1515
github.com/onsi/gomega v1.37.0
1616
github.com/operator-framework/ansible-operator-plugins v1.38.1
17-
github.com/operator-framework/api v0.31.0
18-
github.com/operator-framework/operator-lib v0.18.0
19-
github.com/operator-framework/operator-manifest-tools v0.9.0
17+
github.com/operator-framework/api v0.32.0
18+
github.com/operator-framework/operator-lib v0.19.0
19+
github.com/operator-framework/operator-manifest-tools v0.10.0
2020
github.com/operator-framework/operator-registry v1.55.0
2121
github.com/prometheus/client_golang v1.22.0
22-
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
22+
github.com/sergi/go-diff v1.4.0
2323
github.com/sirupsen/logrus v1.9.3
2424
github.com/spf13/afero v1.14.0
2525
github.com/spf13/cobra v1.9.1
2626
github.com/spf13/pflag v1.0.6
2727
github.com/spf13/viper v1.20.1
2828
github.com/stretchr/testify v1.10.0
2929
github.com/thoas/go-funk v0.9.3
30-
golang.org/x/mod v0.24.0
31-
golang.org/x/text v0.25.0
32-
golang.org/x/tools v0.33.0
30+
golang.org/x/mod v0.25.0
31+
golang.org/x/text v0.26.0
32+
golang.org/x/tools v0.34.0
3333
gomodules.xyz/jsonpatch/v3 v3.0.1
34-
helm.sh/helm/v3 v3.17.3
35-
k8s.io/api v0.32.4
36-
k8s.io/apiextensions-apiserver v0.32.4
37-
k8s.io/apimachinery v0.32.4
38-
k8s.io/cli-runtime v0.32.4
39-
k8s.io/client-go v0.32.4
40-
k8s.io/kubectl v0.32.4
41-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
42-
sigs.k8s.io/controller-runtime v0.20.4
43-
sigs.k8s.io/controller-tools v0.17.2
34+
helm.sh/helm/v3 v3.18.3
35+
k8s.io/api v0.33.2
36+
k8s.io/apiextensions-apiserver v0.33.2
37+
k8s.io/apimachinery v0.33.2
38+
k8s.io/cli-runtime v0.33.2
39+
k8s.io/client-go v0.33.2
40+
k8s.io/kubectl v0.33.2
41+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
42+
sigs.k8s.io/controller-runtime v0.21.0
43+
sigs.k8s.io/controller-tools v0.18.0
4444
sigs.k8s.io/kubebuilder/v4 v4.6.0
45-
sigs.k8s.io/yaml v1.4.0
45+
sigs.k8s.io/yaml v1.5.0
4646
)
4747

48-
// https://github.com/kubernetes/apiserver/issues/116
49-
// reevaluate when we bump to k8s v1.33.0
50-
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
51-
5248
require (
53-
cel.dev/expr v0.23.1 // indirect
49+
cel.dev/expr v0.24.0 // indirect
5450
dario.cat/mergo v1.0.1 // indirect
5551
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5652
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
@@ -64,11 +60,12 @@ require (
6460
github.com/Microsoft/hcsshim v0.12.9 // indirect
6561
github.com/VividCortex/ewma v1.2.0 // indirect
6662
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
67-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
63+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
6864
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6965
github.com/beorn7/perks v1.0.1 // indirect
7066
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
7167
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
68+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
7269
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7370
github.com/chai2010/gettext-go v1.0.2 // indirect
7471
github.com/containerd/cgroups/v3 v3.0.5 // indirect
@@ -88,29 +85,29 @@ require (
8885
github.com/containers/ocicrypt v1.2.1 // indirect
8986
github.com/containers/storage v1.58.0 // indirect
9087
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
91-
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
88+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
9289
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
9390
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
9491
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9592
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
96-
github.com/distribution/distribution/v3 v3.0.0-rc.3 // indirect
93+
github.com/distribution/distribution/v3 v3.0.0 // indirect
9794
github.com/distribution/reference v0.6.0 // indirect
98-
github.com/docker/cli v28.1.1+incompatible // indirect
95+
github.com/docker/cli v28.2.2+incompatible // indirect
9996
github.com/docker/distribution v2.8.3+incompatible // indirect
100-
github.com/docker/docker v28.0.4+incompatible // indirect
97+
github.com/docker/docker v28.2.2+incompatible // indirect
10198
github.com/docker/docker-credential-helpers v0.9.3 // indirect
10299
github.com/docker/go-connections v0.5.0 // indirect
103100
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
104101
github.com/docker/go-metrics v0.0.1 // indirect
105102
github.com/docker/go-units v0.5.0 // indirect
106103
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
107-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
104+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
108105
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
109106
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
110107
github.com/fatih/color v1.18.0 // indirect
111108
github.com/felixge/httpsnoop v1.0.4 // indirect
112109
github.com/fsnotify/fsnotify v1.9.0 // indirect
113-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
110+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
114111
github.com/go-errors/errors v1.4.2 // indirect
115112
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
116113
github.com/go-git/go-billy/v5 v5.6.1 // indirect
@@ -121,7 +118,7 @@ require (
121118
github.com/go-logr/zapr v1.3.0 // indirect
122119
github.com/go-openapi/analysis v0.23.0 // indirect
123120
github.com/go-openapi/errors v0.22.1 // indirect
124-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
121+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
125122
github.com/go-openapi/jsonreference v0.21.0 // indirect
126123
github.com/go-openapi/loads v0.22.0 // indirect
127124
github.com/go-openapi/runtime v0.28.0 // indirect
@@ -140,19 +137,18 @@ require (
140137
github.com/golang/protobuf v1.5.4 // indirect
141138
github.com/google/btree v1.1.3 // indirect
142139
github.com/google/cel-go v0.25.0 // indirect
143-
github.com/google/gnostic-models v0.6.8 // indirect
140+
github.com/google/gnostic-models v0.6.9 // indirect
144141
github.com/google/go-cmp v0.7.0 // indirect
145-
github.com/google/go-containerregistry v0.20.3 // indirect
146-
github.com/google/gofuzz v1.2.0 // indirect
142+
github.com/google/go-containerregistry v0.20.6 // indirect
147143
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
148144
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
149145
github.com/google/uuid v1.6.0 // indirect
150146
github.com/gorilla/handlers v1.5.2 // indirect
151147
github.com/gorilla/mux v1.8.1 // indirect
152-
github.com/gorilla/websocket v1.5.0 // indirect
148+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
153149
github.com/gosuri/uitable v0.0.4 // indirect
154150
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
155-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
151+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 // indirect
156152
github.com/h2non/filetype v1.1.3 // indirect
157153
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
158154
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -211,13 +207,13 @@ require (
211207
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
212208
github.com/proglottis/gpgme v0.1.4 // indirect
213209
github.com/prometheus/client_model v0.6.2 // indirect
214-
github.com/prometheus/common v0.62.0 // indirect
215-
github.com/prometheus/procfs v0.15.1 // indirect
210+
github.com/prometheus/common v0.65.0 // indirect
211+
github.com/prometheus/procfs v0.16.1 // indirect
216212
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
217213
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
218214
github.com/redis/go-redis/v9 v9.7.3 // indirect
219215
github.com/rivo/uniseg v0.4.7 // indirect
220-
github.com/rubenv/sql-migrate v1.7.1 // indirect
216+
github.com/rubenv/sql-migrate v1.8.0 // indirect
221217
github.com/russross/blackfriday/v2 v2.1.0 // indirect
222218
github.com/sagikazarmark/locafero v0.7.0 // indirect
223219
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
@@ -230,7 +226,7 @@ require (
230226
github.com/sourcegraph/conc v0.3.0 // indirect
231227
github.com/spf13/cast v1.7.1 // indirect
232228
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
233-
github.com/stoewer/go-strcase v1.3.0 // indirect
229+
github.com/stoewer/go-strcase v1.3.1 // indirect
234230
github.com/subosito/gotenv v1.6.0 // indirect
235231
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
236232
github.com/ulikunitz/xz v0.5.12 // indirect
@@ -247,58 +243,60 @@ require (
247243
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
248244
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
249245
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
250-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
251-
go.opentelemetry.io/otel v1.34.0 // indirect
246+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
247+
go.opentelemetry.io/otel v1.36.0 // indirect
252248
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
253249
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
254250
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
255251
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
256-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
257-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
252+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
253+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
258254
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
259255
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
260256
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
261257
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
262258
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
263259
go.opentelemetry.io/otel/log v0.8.0 // indirect
264-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
265-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
260+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
261+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
266262
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
267-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
268-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
269-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
263+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
264+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
265+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
270266
go.uber.org/automaxprocs v1.6.0 // indirect
271267
go.uber.org/multierr v1.11.0 // indirect
272268
go.uber.org/zap v1.27.0 // indirect
273-
golang.org/x/crypto v0.38.0 // indirect
274-
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
275-
golang.org/x/net v0.40.0 // indirect
276-
golang.org/x/oauth2 v0.29.0 // indirect
277-
golang.org/x/sync v0.14.0 // indirect
269+
go.yaml.in/yaml/v2 v2.4.2 // indirect
270+
go.yaml.in/yaml/v3 v3.0.3 // indirect
271+
golang.org/x/crypto v0.39.0 // indirect
272+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
273+
golang.org/x/net v0.41.0 // indirect
274+
golang.org/x/oauth2 v0.30.0 // indirect
275+
golang.org/x/sync v0.15.0 // indirect
278276
golang.org/x/sys v0.33.0 // indirect
279277
golang.org/x/term v0.32.0 // indirect
280-
golang.org/x/time v0.11.0 // indirect
278+
golang.org/x/time v0.12.0 // indirect
281279
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
282280
gomodules.xyz/orderedmap v0.1.0 // indirect
283281
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
284-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
285-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
286-
google.golang.org/grpc v1.72.1 // indirect
282+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
283+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
284+
google.golang.org/grpc v1.73.0 // indirect
287285
google.golang.org/protobuf v1.36.6 // indirect
288286
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
289287
gopkg.in/inf.v0 v0.9.1 // indirect
290288
gopkg.in/warnings.v0 v0.1.2 // indirect
291289
gopkg.in/yaml.v2 v2.4.0 // indirect
292290
gopkg.in/yaml.v3 v3.0.1 // indirect
293-
k8s.io/apiserver v0.32.4 // indirect
294-
k8s.io/component-base v0.32.4 // indirect
291+
k8s.io/apiserver v0.33.2 // indirect
292+
k8s.io/component-base v0.33.2 // indirect
295293
k8s.io/klog/v2 v2.130.1 // indirect
296-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
297-
oras.land/oras-go v1.2.5 // indirect
294+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
298295
oras.land/oras-go/v2 v2.6.0 // indirect
299-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
300-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
301-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
302-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
303-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
296+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
297+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
298+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
299+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
300+
sigs.k8s.io/randfill v1.0.0 // indirect
301+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
304302
)

0 commit comments

Comments
 (0)