Skip to content

Commit ee66bb0

Browse files
acornett21acornett21
committed
k8s 1.31 work
Signed-off-by: Adam D. Cornett <[email protected]>
1 parent d0e10c2 commit ee66bb0

File tree

58 files changed

+846
-752
lines changed

Some content is hidden

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

58 files changed

+846
-752
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export IMAGE_VERSION = v1.38.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.30.0
12+
export K8S_VERSION = 1.31.0
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin
@@ -58,7 +58,7 @@ fix: ## Fixup files in the repo.
5858

5959
.PHONY: setup-lint
6060
setup-lint: ## Setup the lint
61-
$(SCRIPTS_DIR)/fetch golangci-lint 1.54.0
61+
$(SCRIPTS_DIR)/fetch golangci-lint 1.62.2
6262

6363
.PHONY: lint
6464
lint: setup-lint ## Run the lint check
@@ -176,12 +176,12 @@ cluster-create::
176176

177177
.PHONY: dev-install
178178
dev-install::
179-
$(SCRIPTS_DIR)/fetch kind 0.23.0
179+
$(SCRIPTS_DIR)/fetch kind 0.24.0
180180
$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
181181

182182
.PHONY: test-e2e-teardown
183183
test-e2e-teardown:
184-
$(SCRIPTS_DIR)/fetch kind 0.23.0
184+
$(SCRIPTS_DIR)/fetch kind 0.24.0
185185
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
186186
rm -f $(KUBECONFIG)
187187

‎go.mod

+76-69
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,78 @@
11
module github.com/operator-framework/operator-sdk
22

3-
go 1.22.5
3+
go 1.23.4
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/fatih/structtag v1.1.0
7+
github.com/fatih/structtag v1.2.0
88
github.com/go-logr/logr v1.4.2
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
1212
github.com/markbates/inflect v1.0.4
13-
github.com/maxbrunsfeld/counterfeiter/v6 v6.9.0
14-
github.com/onsi/ginkgo/v2 v2.20.2
15-
github.com/onsi/gomega v1.34.2
16-
github.com/operator-framework/ansible-operator-plugins v1.36.1
17-
github.com/operator-framework/api v0.24.0
18-
github.com/operator-framework/operator-lib v0.14.0
19-
github.com/operator-framework/operator-manifest-tools v0.6.0
20-
github.com/operator-framework/operator-registry v1.42.0
13+
github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0
14+
github.com/onsi/ginkgo/v2 v2.22.0
15+
github.com/onsi/gomega v1.36.1
16+
github.com/operator-framework/ansible-operator-plugins v1.37.0
17+
github.com/operator-framework/api v0.27.0
18+
github.com/operator-framework/operator-lib v0.15.0
19+
github.com/operator-framework/operator-manifest-tools v0.8.0
20+
github.com/operator-framework/operator-registry v1.47.0
2121
github.com/prometheus/client_golang v1.20.5
2222
github.com/sergi/go-diff v1.3.1
2323
github.com/sirupsen/logrus v1.9.3
2424
github.com/spf13/afero v1.11.0
2525
github.com/spf13/cobra v1.8.1
2626
github.com/spf13/pflag v1.0.5
2727
github.com/spf13/viper v1.19.0
28-
github.com/stretchr/testify v1.9.0
29-
github.com/thoas/go-funk v0.8.0
30-
golang.org/x/mod v0.21.0
28+
github.com/stretchr/testify v1.10.0
29+
github.com/thoas/go-funk v0.9.3
30+
golang.org/x/mod v0.22.0
3131
golang.org/x/text v0.21.0
32-
golang.org/x/tools v0.25.0
32+
golang.org/x/tools v0.28.0
3333
gomodules.xyz/jsonpatch/v3 v3.0.1
34-
helm.sh/helm/v3 v3.15.4
35-
k8s.io/api v0.30.5
36-
k8s.io/apiextensions-apiserver v0.30.5
37-
k8s.io/apimachinery v0.30.5
38-
k8s.io/cli-runtime v0.30.5
39-
k8s.io/client-go v0.30.5
40-
k8s.io/kubectl v0.30.5
41-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
42-
sigs.k8s.io/controller-runtime v0.18.5
43-
sigs.k8s.io/controller-tools v0.14.0
44-
sigs.k8s.io/kubebuilder/v4 v4.1.1
34+
helm.sh/helm/v3 v3.16.3
35+
k8s.io/api v0.31.4
36+
k8s.io/apiextensions-apiserver v0.31.4
37+
k8s.io/apimachinery v0.31.4
38+
k8s.io/cli-runtime v0.31.4
39+
k8s.io/client-go v0.31.4
40+
k8s.io/kubectl v0.31.4
41+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
42+
sigs.k8s.io/controller-runtime v0.19.3
43+
sigs.k8s.io/controller-tools v0.16.5
44+
sigs.k8s.io/kubebuilder/v4 v4.2.0
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

4848
require (
49+
dario.cat/mergo v1.0.1 // indirect
4950
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5051
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5152
github.com/BurntSushi/toml v1.4.0 // indirect
5253
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5354
github.com/Masterminds/goutils v1.1.1 // indirect
54-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
55-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
55+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
56+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5657
github.com/Masterminds/squirrel v1.5.4 // indirect
5758
github.com/Microsoft/go-winio v0.6.2 // indirect
5859
github.com/Microsoft/hcsshim v0.12.5 // indirect
59-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
60+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6061
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6162
github.com/beorn7/perks v1.0.1 // indirect
6263
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
63-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
64+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6465
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6566
github.com/chai2010/gettext-go v1.0.2 // indirect
6667
github.com/containerd/cgroups/v3 v3.0.3 // indirect
67-
github.com/containerd/containerd v1.7.18 // indirect
68+
github.com/containerd/containerd v1.7.23 // indirect
69+
github.com/containerd/containerd/api v1.7.19 // indirect
6870
github.com/containerd/continuity v0.4.2 // indirect
69-
github.com/containerd/errdefs v0.1.0 // indirect
71+
github.com/containerd/errdefs v0.3.0 // indirect
7072
github.com/containerd/log v0.1.0 // indirect
73+
github.com/containerd/platforms v0.2.1 // indirect
7174
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
72-
github.com/containerd/ttrpc v1.2.4 // indirect
75+
github.com/containerd/ttrpc v1.2.5 // indirect
7376
github.com/containerd/typeurl/v2 v2.1.1 // indirect
7477
github.com/containers/common v0.60.4 // indirect
7578
github.com/containers/image/v5 v5.32.2 // indirect
@@ -78,10 +81,10 @@ require (
7881
github.com/containers/storage v1.55.0 // indirect
7982
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8083
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
81-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
84+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
8285
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8386
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
84-
github.com/distribution/distribution/v3 v3.0.0-alpha.1 // indirect
87+
github.com/distribution/distribution/v3 v3.0.0-beta.1 // indirect
8588
github.com/distribution/reference v0.6.0 // indirect
8689
github.com/docker/cli v27.2.0+incompatible // indirect
8790
github.com/docker/distribution v2.8.3+incompatible // indirect
@@ -92,12 +95,13 @@ require (
9295
github.com/docker/go-metrics v0.0.1 // indirect
9396
github.com/docker/go-units v0.5.0 // indirect
9497
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
95-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
98+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
9699
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
97100
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
98-
github.com/fatih/color v1.16.0 // indirect
101+
github.com/fatih/color v1.18.0 // indirect
99102
github.com/felixge/httpsnoop v1.0.4 // indirect
100103
github.com/fsnotify/fsnotify v1.7.0 // indirect
104+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
101105
github.com/go-errors/errors v1.4.2 // indirect
102106
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
103107
github.com/go-git/go-billy/v5 v5.5.0 // indirect
@@ -110,39 +114,39 @@ require (
110114
github.com/go-openapi/swag v0.23.0 // indirect
111115
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
112116
github.com/gobuffalo/envy v1.6.5 // indirect
113-
github.com/gobuffalo/flect v1.0.2 // indirect
117+
github.com/gobuffalo/flect v1.0.3 // indirect
114118
github.com/gobwas/glob v0.2.3 // indirect
115119
github.com/gogo/protobuf v1.3.2 // indirect
116120
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
117121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
118122
github.com/golang/protobuf v1.5.4 // indirect
119123
github.com/google/btree v1.1.2 // indirect
120-
github.com/google/cel-go v0.17.8 // indirect
124+
github.com/google/cel-go v0.20.1 // indirect
121125
github.com/google/gnostic-models v0.6.8 // indirect
122126
github.com/google/go-cmp v0.6.0 // indirect
123127
github.com/google/go-containerregistry v0.20.0 // indirect
124128
github.com/google/gofuzz v1.2.0 // indirect
125-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
129+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
126130
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
127131
github.com/google/uuid v1.6.0 // indirect
128132
github.com/gorilla/handlers v1.5.2 // indirect
129133
github.com/gorilla/mux v1.8.1 // indirect
130134
github.com/gorilla/websocket v1.5.0 // indirect
131135
github.com/gosuri/uitable v0.0.4 // indirect
132136
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
133-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
137+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
134138
github.com/h2non/filetype v1.1.3 // indirect
135139
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
136140
github.com/hashicorp/errwrap v1.1.0 // indirect
137141
github.com/hashicorp/go-multierror v1.1.1 // indirect
138142
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
139143
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
140144
github.com/hashicorp/hcl v1.0.0 // indirect
141-
github.com/huandu/xstrings v1.4.0 // indirect
145+
github.com/huandu/xstrings v1.5.0 // indirect
142146
github.com/imdario/mergo v0.3.16 // indirect
143147
github.com/inconshreveable/mousetrap v1.1.0 // indirect
144148
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
145-
github.com/jmoiron/sqlx v1.3.5 // indirect
149+
github.com/jmoiron/sqlx v1.4.0 // indirect
146150
github.com/joelanford/ignore v0.1.0 // indirect
147151
github.com/joho/godotenv v1.3.0 // indirect
148152
github.com/josharian/intern v1.0.0 // indirect
@@ -157,17 +161,18 @@ require (
157161
github.com/mattn/go-colorable v0.1.13 // indirect
158162
github.com/mattn/go-isatty v0.0.20 // indirect
159163
github.com/mattn/go-runewidth v0.0.16 // indirect
160-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
164+
github.com/mattn/go-sqlite3 v1.14.23 // indirect
161165
github.com/mitchellh/copystructure v1.2.0 // indirect
162166
github.com/mitchellh/go-homedir v1.1.0 // indirect
163167
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
164168
github.com/mitchellh/mapstructure v1.5.0 // indirect
165169
github.com/mitchellh/reflectwalk v1.0.2 // indirect
166170
github.com/moby/locker v1.0.1 // indirect
167-
github.com/moby/spdystream v0.2.0 // indirect
171+
github.com/moby/spdystream v0.4.0 // indirect
168172
github.com/moby/sys/mountinfo v0.7.2 // indirect
169173
github.com/moby/sys/sequential v0.5.0 // indirect
170-
github.com/moby/sys/user v0.2.0 // indirect
174+
github.com/moby/sys/user v0.3.0 // indirect
175+
github.com/moby/sys/userns v0.1.0 // indirect
171176
github.com/moby/term v0.5.0 // indirect
172177
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
173178
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -190,45 +195,46 @@ require (
190195
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
191196
github.com/redis/go-redis/v9 v9.1.0 // indirect
192197
github.com/rivo/uniseg v0.4.7 // indirect
193-
github.com/rubenv/sql-migrate v1.5.2 // indirect
198+
github.com/rubenv/sql-migrate v1.7.0 // indirect
194199
github.com/russross/blackfriday/v2 v2.1.0 // indirect
195200
github.com/sagikazarmark/locafero v0.4.0 // indirect
196201
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
197-
github.com/shopspring/decimal v1.3.1 // indirect
202+
github.com/shopspring/decimal v1.4.0 // indirect
198203
github.com/sourcegraph/conc v0.3.0 // indirect
199-
github.com/spf13/cast v1.6.0 // indirect
204+
github.com/spf13/cast v1.7.0 // indirect
200205
github.com/stoewer/go-strcase v1.3.0 // indirect
201206
github.com/subosito/gotenv v1.6.0 // indirect
202207
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
203208
github.com/vbatts/tar-split v0.11.5 // indirect
209+
github.com/x448/float16 v0.8.4 // indirect
204210
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
205211
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
206212
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
207213
github.com/xlab/treeprint v1.2.0 // indirect
208-
go.etcd.io/bbolt v1.3.10 // indirect
214+
go.etcd.io/bbolt v1.3.11 // indirect
209215
go.opencensus.io v0.24.0 // indirect
210216
go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
211-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
212-
go.opentelemetry.io/otel v1.24.0 // indirect
217+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
218+
go.opentelemetry.io/otel v1.28.0 // indirect
213219
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
214220
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
215-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
216-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
221+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
222+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
217223
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
218224
go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
219225
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
220226
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
221-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
222-
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
223-
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
224-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
225-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
227+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
228+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
229+
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
230+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
231+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
226232
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
227233
go.uber.org/multierr v1.11.0 // indirect
228234
go.uber.org/zap v1.26.0 // indirect
229235
golang.org/x/crypto v0.31.0 // indirect
230236
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
231-
golang.org/x/net v0.29.0 // indirect
237+
golang.org/x/net v0.32.0 // indirect
232238
golang.org/x/oauth2 v0.22.0 // indirect
233239
golang.org/x/sync v0.10.0 // indirect
234240
golang.org/x/sys v0.28.0 // indirect
@@ -237,23 +243,24 @@ require (
237243
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
238244
gomodules.xyz/orderedmap v0.1.0 // indirect
239245
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
240-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
241-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
242-
google.golang.org/grpc v1.64.1 // indirect
243-
google.golang.org/protobuf v1.34.2 // indirect
246+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
247+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
248+
google.golang.org/grpc v1.66.0 // indirect
249+
google.golang.org/protobuf v1.35.1 // indirect
250+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
244251
gopkg.in/inf.v0 v0.9.1 // indirect
245252
gopkg.in/ini.v1 v1.67.0 // indirect
246253
gopkg.in/warnings.v0 v0.1.2 // indirect
247254
gopkg.in/yaml.v2 v2.4.0 // indirect
248255
gopkg.in/yaml.v3 v3.0.1 // indirect
249-
k8s.io/apiserver v0.30.5 // indirect
250-
k8s.io/component-base v0.30.5 // indirect
251-
k8s.io/klog/v2 v2.120.1 // indirect
256+
k8s.io/apiserver v0.31.4 // indirect
257+
k8s.io/component-base v0.31.4 // indirect
258+
k8s.io/klog/v2 v2.130.1 // indirect
252259
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
253260
oras.land/oras-go v1.2.5 // indirect
254-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
261+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
255262
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
256-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
257-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
263+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
264+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
258265
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
259266
)

0 commit comments

Comments
 (0)