Skip to content

Commit 9a639f2

Browse files
Neo2308acornett21
Neo2308
and
acornett21
authored
updating to k8s 1.30 dependencies and kubebuilder v4 (#6848)
* updating go to 1.22 and k8s to 1.30 Signed-off-by: Adam D. Cornett <[email protected]> * Disable interactive Signed-off-by: Neo2308 <[email protected]> * Fix malformed manager.yaml in helm testdata * Fix malformerd manager.yaml in helm testdata. * Use patches instead of patchesJson6902. Signed-off-by: Neo2308 <[email protected]> * Partially fix integration test Signed-off-by: Neo2308 <[email protected]> * Revert "Partially fix integration test" This reverts commit 0468c3f. Signed-off-by: Neo2308 <[email protected]> * Fixing tests Signed-off-by: Neo2308 <[email protected]> * fixing go binary version in sdk docker file Signed-off-by: Adam D. Cornett <[email protected]> * changing curl logic to look for '< HTTP/1.1 200 OK' Signed-off-by: Adam D. Cornett <[email protected]> * fixup! fixing go binary version in sdk docker file Signed-off-by: Adam D. Cornett <[email protected]> * Fix helm test * Use http endpoint instead of https endpoint for helm e2e tests. * Delete curl pod from tc Namespace properly. Signed-off-by: Neo2308 <[email protected]> * fixup! updating go to 1.22 and k8s to 1.30 Signed-off-by: Adam D. Cornett <[email protected]> * switching helm tests back to https, there is more work to do around `metrics-secure` for helm (and then ansible repo) Signed-off-by: Adam D. Cornett <[email protected]> * adding in new flag to helm operator to support metrics authn/authz Signed-off-by: Adam D. Cornett <[email protected]> * updating helm scaffolding based on pr comments Signed-off-by: Adam D. Cornett <[email protected]> * removing env-test plugin since go/v2 scaffolding support has been removed Signed-off-by: Adam D. Cornett <[email protected]> * adding hasDifferentAPIVersion method directly for helm plugin, since this has been removed from kubebuilder and is probably still needed for helm Signed-off-by: Adam D. Cornett <[email protected]> * removing predicate go file that was added, and updating helm controller logic to use generics properly Signed-off-by: Adam D. Cornett <[email protected]> * fixing copy past issue in run bundle md, for ubi default image Signed-off-by: Adam D. Cornett <[email protected]> * updating metrics-require-rbac and metrics-secure validation logic and error log Signed-off-by: Adam D. Cornett <[email protected]> * switching back helm watch calls to use type casting to `client.Object` for consistency in the operator-sdk ecosystem Signed-off-by: Adam D. Cornett <[email protected]> * updating default init image back to ubi from ubi-minimal Signed-off-by: Adam D. Cornett <[email protected]> --------- Signed-off-by: Adam D. Cornett <[email protected]> Signed-off-by: Neo2308 <[email protected]> Co-authored-by: Adam D. Cornett <[email protected]>
1 parent 625fccd commit 9a639f2

File tree

143 files changed

+1031
-1223
lines changed

Some content is hidden

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

143 files changed

+1031
-1223
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export IMAGE_VERSION = v1.37.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.29.0
12+
export K8S_VERSION = 1.30.0
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin
@@ -176,12 +176,12 @@ cluster-create::
176176

177177
.PHONY: dev-install
178178
dev-install::
179-
$(SCRIPTS_DIR)/fetch kind 0.17.0
179+
$(SCRIPTS_DIR)/fetch kind 0.23.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.17.0
184+
$(SCRIPTS_DIR)/fetch kind 0.23.0
185185
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
186186
rm -f $(KUBECONFIG)
187187

‎go.mod‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
module github.com/operator-framework/operator-sdk
22

3-
go 1.21
3+
go 1.22.5
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/fatih/structtag v1.1.0
8-
github.com/go-logr/logr v1.4.1
8+
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.8.1
14-
github.com/onsi/ginkgo/v2 v2.17.2
15-
github.com/onsi/gomega v1.33.0
16-
github.com/operator-framework/ansible-operator-plugins v1.35.0
17-
github.com/operator-framework/api v0.23.0
18-
github.com/operator-framework/operator-lib v0.13.0
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.0
17+
github.com/operator-framework/api v0.24.0
18+
github.com/operator-framework/operator-lib v0.14.0
1919
github.com/operator-framework/operator-manifest-tools v0.6.0
20-
github.com/operator-framework/operator-registry v1.39.0
21-
github.com/prometheus/client_golang v1.19.0
20+
github.com/operator-framework/operator-registry v1.42.0
21+
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
25-
github.com/spf13/cobra v1.8.0
25+
github.com/spf13/cobra v1.8.1
2626
github.com/spf13/pflag v1.0.5
27-
github.com/spf13/viper v1.18.2
27+
github.com/spf13/viper v1.19.0
2828
github.com/stretchr/testify v1.9.0
2929
github.com/thoas/go-funk v0.8.0
30-
golang.org/x/mod v0.17.0
31-
golang.org/x/text v0.14.0
32-
golang.org/x/tools v0.20.0
30+
golang.org/x/mod v0.21.0
31+
golang.org/x/text v0.19.0
32+
golang.org/x/tools v0.25.0
3333
gomodules.xyz/jsonpatch/v3 v3.0.1
34-
helm.sh/helm/v3 v3.14.3
35-
k8s.io/api v0.29.3
36-
k8s.io/apiextensions-apiserver v0.29.3
37-
k8s.io/apimachinery v0.29.3
38-
k8s.io/cli-runtime v0.29.3
39-
k8s.io/client-go v0.29.3
40-
k8s.io/kubectl v0.29.3
41-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
42-
sigs.k8s.io/controller-runtime v0.17.4
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
4343
sigs.k8s.io/controller-tools v0.14.0
44-
sigs.k8s.io/kubebuilder/v3 v3.14.2
44+
sigs.k8s.io/kubebuilder/v4 v4.1.1
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

@@ -55,28 +55,29 @@ require (
5555
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
5656
github.com/Masterminds/squirrel v1.5.4 // indirect
5757
github.com/Microsoft/go-winio v0.6.1 // indirect
58-
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
58+
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
5959
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6060
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6161
github.com/beorn7/perks v1.0.1 // indirect
6262
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
6363
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
64-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
64+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6565
github.com/chai2010/gettext-go v1.0.2 // indirect
6666
github.com/containerd/cgroups/v3 v3.0.2 // indirect
67-
github.com/containerd/containerd v1.7.12 // indirect
67+
github.com/containerd/containerd v1.7.16 // indirect
6868
github.com/containerd/continuity v0.4.2 // indirect
69+
github.com/containerd/errdefs v0.1.0 // indirect
6970
github.com/containerd/log v0.1.0 // indirect
7071
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
71-
github.com/containerd/ttrpc v1.2.2 // indirect
72+
github.com/containerd/ttrpc v1.2.3 // indirect
7273
github.com/containerd/typeurl/v2 v2.1.1 // indirect
73-
github.com/containers/common v0.57.1 // indirect
74-
github.com/containers/image/v5 v5.29.0 // indirect
74+
github.com/containers/common v0.58.2 // indirect
75+
github.com/containers/image/v5 v5.30.1 // indirect
7576
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7677
github.com/containers/ocicrypt v1.1.9 // indirect
77-
github.com/containers/storage v1.51.0 // indirect
78+
github.com/containers/storage v1.53.0 // indirect
7879
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
79-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
80+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
8081
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
8182
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8283
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -85,14 +86,14 @@ require (
8586
github.com/docker/cli v27.2.0+incompatible // indirect
8687
github.com/docker/distribution v2.8.3+incompatible // indirect
8788
github.com/docker/docker v27.2.0+incompatible // indirect
88-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
89+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
8990
github.com/docker/go-connections v0.5.0 // indirect
9091
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
9192
github.com/docker/go-metrics v0.0.1 // indirect
9293
github.com/docker/go-units v0.5.0 // indirect
9394
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
9495
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
95-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
96+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
9697
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
9798
github.com/fatih/color v1.16.0 // indirect
9899
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -106,22 +107,22 @@ require (
106107
github.com/go-logr/zapr v1.3.0 // indirect
107108
github.com/go-openapi/jsonpointer v0.20.2 // indirect
108109
github.com/go-openapi/jsonreference v0.20.4 // indirect
109-
github.com/go-openapi/swag v0.22.9 // indirect
110+
github.com/go-openapi/swag v0.22.10 // indirect
110111
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
111112
github.com/gobuffalo/envy v1.6.5 // indirect
112113
github.com/gobuffalo/flect v1.0.2 // indirect
113114
github.com/gobwas/glob v0.2.3 // indirect
114115
github.com/gogo/protobuf v1.3.2 // indirect
115-
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
116+
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
116117
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
117118
github.com/golang/protobuf v1.5.4 // indirect
118119
github.com/google/btree v1.1.2 // indirect
119-
github.com/google/cel-go v0.17.7 // indirect
120+
github.com/google/cel-go v0.17.8 // indirect
120121
github.com/google/gnostic-models v0.6.8 // indirect
121122
github.com/google/go-cmp v0.6.0 // indirect
122123
github.com/google/go-containerregistry v0.19.1 // indirect
123124
github.com/google/gofuzz v1.2.0 // indirect
124-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
125+
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
125126
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
126127
github.com/google/uuid v1.6.0 // indirect
127128
github.com/gorilla/handlers v1.5.2 // indirect
@@ -142,11 +143,11 @@ require (
142143
github.com/inconshreveable/mousetrap v1.1.0 // indirect
143144
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
144145
github.com/jmoiron/sqlx v1.3.5 // indirect
145-
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
146+
github.com/joelanford/ignore v0.1.0 // indirect
146147
github.com/joho/godotenv v1.3.0 // indirect
147148
github.com/josharian/intern v1.0.0 // indirect
148149
github.com/json-iterator/go v1.1.12 // indirect
149-
github.com/klauspost/compress v1.17.4 // indirect
150+
github.com/klauspost/compress v1.17.9 // indirect
150151
github.com/klauspost/pgzip v1.2.6 // indirect
151152
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
152153
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -167,25 +168,25 @@ require (
167168
github.com/moby/spdystream v0.2.0 // indirect
168169
github.com/moby/sys/mountinfo v0.7.1 // indirect
169170
github.com/moby/sys/sequential v0.5.0 // indirect
171+
github.com/moby/sys/user v0.1.0 // indirect
170172
github.com/moby/term v0.5.0 // indirect
171173
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
172174
github.com/modern-go/reflect2 v1.0.2 // indirect
173175
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
174176
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
175177
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
176178
github.com/opencontainers/go-digest v1.0.0 // indirect
177-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
178-
github.com/opencontainers/runc v1.1.14 // indirect
179-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
179+
github.com/opencontainers/image-spec v1.1.0 // indirect
180+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
180181
github.com/otiai10/copy v1.14.0 // indirect
181-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
182+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
182183
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
183184
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
184185
github.com/pkg/errors v0.9.1 // indirect
185186
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
186187
github.com/prometheus/client_model v0.6.1 // indirect
187-
github.com/prometheus/common v0.48.0 // indirect
188-
github.com/prometheus/procfs v0.12.0 // indirect
188+
github.com/prometheus/common v0.55.0 // indirect
189+
github.com/prometheus/procfs v0.15.1 // indirect
189190
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
190191
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
191192
github.com/redis/go-redis/v9 v9.1.0 // indirect
@@ -206,11 +207,11 @@ require (
206207
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
207208
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
208209
github.com/xlab/treeprint v1.2.0 // indirect
209-
go.etcd.io/bbolt v1.3.9 // indirect
210+
go.etcd.io/bbolt v1.3.10 // indirect
210211
go.opencensus.io v0.24.0 // indirect
211212
go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
212-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
213-
go.opentelemetry.io/otel v1.23.1 // indirect
213+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
214+
go.opentelemetry.io/otel v1.24.0 // indirect
214215
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
215216
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
216217
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
@@ -219,39 +220,38 @@ require (
219220
go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
220221
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
221222
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
222-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
223+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
223224
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
224225
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
225-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
226+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
226227
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
227228
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
228229
go.uber.org/multierr v1.11.0 // indirect
229230
go.uber.org/zap v1.26.0 // indirect
230-
golang.org/x/crypto v0.22.0 // indirect
231-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
232-
golang.org/x/net v0.24.0 // indirect
233-
golang.org/x/oauth2 v0.17.0 // indirect
234-
golang.org/x/sync v0.7.0 // indirect
235-
golang.org/x/sys v0.19.0 // indirect
236-
golang.org/x/term v0.19.0 // indirect
231+
golang.org/x/crypto v0.27.0 // indirect
232+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
233+
golang.org/x/net v0.29.0 // indirect
234+
golang.org/x/oauth2 v0.21.0 // indirect
235+
golang.org/x/sync v0.8.0 // indirect
236+
golang.org/x/sys v0.25.0 // indirect
237+
golang.org/x/term v0.24.0 // indirect
237238
golang.org/x/time v0.5.0 // indirect
238239
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
239240
gomodules.xyz/orderedmap v0.1.0 // indirect
240-
google.golang.org/appengine v1.6.8 // indirect
241-
google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect
242-
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
243-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
244-
google.golang.org/grpc v1.61.1 // indirect
245-
google.golang.org/protobuf v1.33.0 // indirect
241+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
242+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
243+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
244+
google.golang.org/grpc v1.63.2 // indirect
245+
google.golang.org/protobuf v1.34.2 // indirect
246246
gopkg.in/inf.v0 v0.9.1 // indirect
247247
gopkg.in/ini.v1 v1.67.0 // indirect
248248
gopkg.in/warnings.v0 v0.1.2 // indirect
249249
gopkg.in/yaml.v2 v2.4.0 // indirect
250250
gopkg.in/yaml.v3 v3.0.1 // indirect
251-
k8s.io/apiserver v0.29.3 // indirect
252-
k8s.io/component-base v0.29.3 // indirect
251+
k8s.io/apiserver v0.30.5 // indirect
252+
k8s.io/component-base v0.30.5 // indirect
253253
k8s.io/klog/v2 v2.120.1 // indirect
254-
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect
254+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
255255
oras.land/oras-go v1.2.5 // indirect
256256
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
257257
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)