Skip to content

Commit 96f3198

Browse files
everettraveneverettraven
authored
(chore): bump k8s and kubebuilder (#6613)
* wip: bump k8s and kubebuilder Signed-off-by: Bryce Palmer <[email protected]> * bump k8s in makefile Signed-off-by: Bryce Palmer <[email protected]> * comment ansible dep to progress further Signed-off-by: Bryce Palmer <[email protected]> * bump ansible plugin version, regenerate testdata Signed-off-by: everettraven <[email protected]> * go mod tidy after rebase Signed-off-by: everettraven <[email protected]> * fix operator-sdk olm install by making it use a proper HTTP client for building the kubernetes client, ensuring OLM apis are added to the scheme.Scheme used with the kubernetes client, and splitting CRD and resource checks and installation into distinct steps. This ensures CRDs are installed and ready prior to the creation of associated CRs. Signed-off-by: everettraven <[email protected]> * update olm bindata + fix lint errors Signed-off-by: everettraven <[email protected]> * bump olm version for e2e Signed-off-by: everettraven <[email protected]> * olm install - attempt to create resources until context is canceled which will typically occur when the specified timeout has been reached Signed-off-by: everettraven <[email protected]> * fix failing unit test Signed-off-by: everettraven <[email protected]> * add a changelog Signed-off-by: everettraven <[email protected]> * address review comments Signed-off-by: everettraven <[email protected]> * update go e2e to use go/v4 testdata Signed-off-by: everettraven <[email protected]> * update sample e2e and integration tests to use go/v4 testdata Signed-off-by: everettraven <[email protected]> --------- Signed-off-by: Bryce Palmer <[email protected]> Signed-off-by: Bryce Palmer <[email protected]> Signed-off-by: everettraven <[email protected]>
1 parent e001847 commit 96f3198

File tree

218 files changed

+1675
-2519
lines changed

Some content is hidden

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

218 files changed

+1675
-2519
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.32.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.26.0
12+
export K8S_VERSION = 1.27.0
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin
@@ -44,7 +44,7 @@ generate: build # Generate CLI docs and samples
4444
$(GO) generate ./...
4545

4646
.PHONY: bindata
47-
OLM_VERSIONS = 0.23.1 0.24.0 0.25.0
47+
OLM_VERSIONS = 0.24.0 0.25.0 0.26.0
4848
bindata: ## Update project bindata
4949
./hack/generate/olm_bindata.sh $(OLM_VERSIONS)
5050
$(MAKE) fix
@@ -191,7 +191,7 @@ $(e2e_targets):: test-e2e-setup image/scorecard-test
191191
test-e2e:: $(e2e_tests) ## Run e2e tests
192192

193193
test-e2e-sample-go:: dev-install cluster-create ## Run Memcached Operator Sample e2e tests
194-
make test-e2e -C ./testdata/go/v3/memcached-operator/
194+
make test-e2e -C ./testdata/go/v4/memcached-operator/
195195
test-e2e-go:: image/custom-scorecard-tests ## Run Go e2e tests
196196
$(GO) test ./test/e2e/go -v -ginkgo.v
197197
test-e2e-helm:: image/helm-operator ## Run Helm e2e tests

‎changelog/fragments/01-k8s-kubebuilder-bump.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
Bump supported Kubernetes version to 1.27
6+
kind: "change"
7+
breaking: false
8+
- description: >
9+
(helm/v1): Deprecate the `--config` flag due to the controller-runtime ComponentConfig
10+
package being deprecated with the planned removal of support for loading manager options
11+
from a file
12+
kind: "deprecation"
13+
breaking: false
14+
- description: >
15+
(go/v4-alpha): go/v4 is now stable and is the default version
16+
used when scaffolding a Go based operator
17+
kind: "change"
18+
breaking: true
19+
migration:
20+
header: (go/v4-alpha) Move go/v4 plugin from alpha to stable
21+
body: |
22+
The transition from Golang v2 and v3 plugins to the new Golang v4 plugin introduces significant changes.
23+
To gain insights into the reasoning behind these changes, you can refer to the explanation provided
24+
at https://book.kubebuilder.io/migration/v3vsv4#tldr-of-the-new-gov4-plugin.
25+
26+
For a comprehensive understanding of the migration process to the v4 plugin format,
27+
the Kubebuilder documentation outlines the necessary steps. Detailed instructions
28+
can be found at https://book.kubebuilder.io/migration/manually_migration_guide_gov3_to_gov4.
29+
30+
This migration is designed to enhance your project's functionality and compatibility,
31+
reflecting the evolving landscape of Golang development.
32+
- description: >
33+
(kustomize/v2-alpha): kustomize/v2 is now stable and is the default version
34+
used in the plugin chain when using go/v4, ansible/v1, helm/v1, and hybrid/v1-alpha plugins
35+
kind: "change"
36+
breaking: true
37+
migration:
38+
header: (kustomize/v2-alpha) Move kustomize/v2 plugin from alpha to stable
39+
body: |
40+
For more information on the kustomize/v2 plugin, please refer to the documentation at
41+
https://book.kubebuilder.io/plugins/kustomize-v2
42+
- description: >
43+
`operator-sdk olm install`: fix a bug where the retry logic would not
44+
retry until the the command's timeout was reached, resulting in early exiting
45+
of the command before the specified timeout was reached.
46+
kind: "bugfix"
47+
breaking: false
48+
- description: >
49+
Updated the supported OLM versions to 0.24.0, 0.25.0, and 0.26.0
50+
kind: "change"
51+
breaking: false
52+

‎go.mod

Lines changed: 77 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,45 @@ go 1.21
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.2.3
9-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
8+
github.com/go-logr/logr v1.2.4
9+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
1010
github.com/iancoleman/strcase v0.2.0
1111
github.com/kr/text v0.2.0
1212
github.com/markbates/inflect v1.0.4
1313
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
14-
github.com/onsi/ginkgo/v2 v2.7.0
15-
github.com/onsi/gomega v1.24.2
16-
github.com/operator-framework/ansible-operator-plugins v1.32.0
17-
github.com/operator-framework/api v0.17.5
18-
github.com/operator-framework/helm-operator-plugins v0.0.12-0.20230413193425-4632388adc61
19-
github.com/operator-framework/java-operator-plugins v0.7.1-0.20230306190439-0eed476d2b75
20-
github.com/operator-framework/operator-lib v0.11.1-0.20230306195046-28cadc6b6055
21-
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230227155221-caa8b9e1ab12
22-
github.com/operator-framework/operator-registry v1.28.0
23-
github.com/prometheus/client_golang v1.14.0
14+
github.com/onsi/ginkgo/v2 v2.12.0
15+
github.com/onsi/gomega v1.27.10
16+
github.com/operator-framework/ansible-operator-plugins v1.33.0
17+
github.com/operator-framework/api v0.17.7
18+
github.com/operator-framework/helm-operator-plugins v0.0.11
19+
github.com/operator-framework/java-operator-plugins v0.8.1
20+
github.com/operator-framework/operator-lib v0.11.1-0.20231020142438-152ee1fb7f83
21+
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230525225330-523bad646f89
22+
github.com/operator-framework/operator-registry v1.29.0
23+
github.com/prometheus/client_golang v1.16.0
2424
github.com/sergi/go-diff v1.2.0
2525
github.com/sirupsen/logrus v1.9.3
26-
github.com/spf13/afero v1.9.3
27-
github.com/spf13/cobra v1.6.1
26+
github.com/spf13/afero v1.9.5
27+
github.com/spf13/cobra v1.7.0
2828
github.com/spf13/pflag v1.0.5
2929
github.com/spf13/viper v1.10.0
30-
github.com/stretchr/testify v1.8.2
30+
github.com/stretchr/testify v1.8.4
3131
github.com/thoas/go-funk v0.8.0
3232
golang.org/x/mod v0.13.0
3333
golang.org/x/text v0.13.0
3434
golang.org/x/tools v0.13.0
3535
gomodules.xyz/jsonpatch/v3 v3.0.1
36-
helm.sh/helm/v3 v3.11.3
37-
k8s.io/api v0.26.10
38-
k8s.io/apiextensions-apiserver v0.26.10
39-
k8s.io/apimachinery v0.26.10
40-
k8s.io/cli-runtime v0.26.10
41-
k8s.io/client-go v0.26.10
42-
k8s.io/kubectl v0.26.10
36+
helm.sh/helm/v3 v3.12.1
37+
k8s.io/api v0.27.7
38+
k8s.io/apiextensions-apiserver v0.27.7
39+
k8s.io/apimachinery v0.27.7
40+
k8s.io/cli-runtime v0.27.6
41+
k8s.io/client-go v0.27.7
42+
k8s.io/kubectl v0.27.6
4343
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
44-
sigs.k8s.io/controller-runtime v0.14.7
45-
sigs.k8s.io/controller-tools v0.11.3
46-
sigs.k8s.io/kubebuilder/v3 v3.9.1
44+
sigs.k8s.io/controller-runtime v0.15.3
45+
sigs.k8s.io/controller-tools v0.12.1
46+
sigs.k8s.io/kubebuilder/v3 v3.12.0
4747
sigs.k8s.io/yaml v1.3.0
4848
)
4949

@@ -52,73 +52,74 @@ require (
5252
github.com/BurntSushi/toml v1.2.1 // indirect
5353
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5454
github.com/Masterminds/goutils v1.1.1 // indirect
55-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
55+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
5656
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
57-
github.com/Masterminds/squirrel v1.5.3 // indirect
57+
github.com/Masterminds/squirrel v1.5.4 // indirect
5858
github.com/Microsoft/go-winio v0.6.1 // indirect
59-
github.com/Microsoft/hcsshim v0.9.4 // indirect
59+
github.com/Microsoft/hcsshim v0.11.0 // indirect
6060
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
6161
github.com/adrg/xdg v0.4.0 // indirect
62-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
63-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
62+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
63+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6464
github.com/beorn7/perks v1.0.1 // indirect
6565
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
6666
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
6767
github.com/bugsnag/panicwrap v1.2.0 // indirect
6868
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
6969
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7070
github.com/chai2010/gettext-go v1.0.2 // indirect
71-
github.com/containerd/cgroups v1.0.4 // indirect
72-
github.com/containerd/containerd v1.7.0 // indirect
71+
github.com/containerd/cgroups v1.1.0 // indirect
72+
github.com/containerd/containerd v1.7.6 // indirect
7373
github.com/containerd/continuity v0.3.0 // indirect
74-
github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect
75-
github.com/containerd/ttrpc v1.1.0 // indirect
74+
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
75+
github.com/containerd/ttrpc v1.1.2 // indirect
7676
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
7777
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
7878
github.com/davecgh/go-spew v1.1.1 // indirect
7979
github.com/distribution/distribution/v3 v3.0.0-20230611135314-6a57630cf401 // indirect
80-
github.com/docker/cli v20.10.21+incompatible // indirect
80+
github.com/docker/cli v24.0.6+incompatible // indirect
8181
github.com/docker/distribution v2.8.2+incompatible // indirect
82-
github.com/docker/docker v20.10.24+incompatible // indirect
82+
github.com/docker/docker v24.0.6+incompatible // indirect
8383
github.com/docker/docker-credential-helpers v0.7.0 // indirect
8484
github.com/docker/go-connections v0.4.0 // indirect
8585
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
8686
github.com/docker/go-metrics v0.0.1 // indirect
8787
github.com/docker/go-units v0.5.0 // indirect
8888
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
89-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
89+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9090
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
9191
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9292
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
93-
github.com/fatih/color v1.13.0 // indirect
93+
github.com/fatih/color v1.15.0 // indirect
9494
github.com/felixge/httpsnoop v1.0.3 // indirect
9595
github.com/fsnotify/fsnotify v1.6.0 // indirect
9696
github.com/ghodss/yaml v1.0.0 // indirect
9797
github.com/go-errors/errors v1.4.2 // indirect
9898
github.com/go-git/gcfg v1.5.0 // indirect
9999
github.com/go-git/go-billy/v5 v5.1.0 // indirect
100100
github.com/go-git/go-git/v5 v5.3.0 // indirect
101-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
101+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
102102
github.com/go-logr/stdr v1.2.2 // indirect
103-
github.com/go-logr/zapr v1.2.3 // indirect
104-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
105-
github.com/go-openapi/jsonreference v0.20.0 // indirect
106-
github.com/go-openapi/swag v0.22.3 // indirect
103+
github.com/go-logr/zapr v1.2.4 // indirect
104+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
105+
github.com/go-openapi/jsonreference v0.20.2 // indirect
106+
github.com/go-openapi/swag v0.22.4 // indirect
107107
github.com/gobuffalo/envy v1.6.5 // indirect
108-
github.com/gobuffalo/flect v1.0.0 // indirect
108+
github.com/gobuffalo/flect v1.0.2 // indirect
109109
github.com/gobwas/glob v0.2.3 // indirect
110110
github.com/gofrs/uuid v4.0.0+incompatible // indirect
111111
github.com/gogo/protobuf v1.3.2 // indirect
112112
github.com/golang-migrate/migrate/v4 v4.16.1 // indirect
113113
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
114-
github.com/golang/protobuf v1.5.2 // indirect
114+
github.com/golang/protobuf v1.5.3 // indirect
115115
github.com/gomodule/redigo v1.8.2 // indirect
116116
github.com/google/btree v1.1.2 // indirect
117-
github.com/google/cel-go v0.12.7 // indirect
117+
github.com/google/cel-go v0.16.1 // indirect
118118
github.com/google/gnostic v0.6.9 // indirect
119119
github.com/google/go-cmp v0.5.9 // indirect
120-
github.com/google/go-containerregistry v0.8.0 // indirect
120+
github.com/google/go-containerregistry v0.15.2 // indirect
121121
github.com/google/gofuzz v1.2.0 // indirect
122+
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
122123
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
123124
github.com/google/uuid v1.3.0 // indirect
124125
github.com/gorilla/handlers v1.5.1 // indirect
@@ -133,8 +134,8 @@ require (
133134
github.com/hashicorp/golang-lru v0.5.4 // indirect
134135
github.com/hashicorp/hcl v1.0.0 // indirect
135136
github.com/huandu/xstrings v1.4.0 // indirect
136-
github.com/imdario/mergo v0.3.13 // indirect
137-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
137+
github.com/imdario/mergo v0.3.16 // indirect
138+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
138139
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
139140
github.com/jmoiron/sqlx v1.3.5 // indirect
140141
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
@@ -145,7 +146,7 @@ require (
145146
github.com/klauspost/compress v1.16.5 // indirect
146147
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
147148
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
148-
github.com/lib/pq v1.10.7 // indirect
149+
github.com/lib/pq v1.10.9 // indirect
149150
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
150151
github.com/magiconair/properties v1.8.5 // indirect
151152
github.com/mailru/easyjson v0.7.7 // indirect
@@ -167,16 +168,16 @@ require (
167168
github.com/morikuni/aec v1.0.0 // indirect
168169
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
169170
github.com/opencontainers/go-digest v1.0.0 // indirect
170-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
171+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
171172
github.com/otiai10/copy v1.2.0 // indirect
172173
github.com/pelletier/go-toml v1.9.5 // indirect
173174
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
174175
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
175176
github.com/pkg/errors v0.9.1 // indirect
176177
github.com/pmezard/go-difflib v1.0.0 // indirect
177-
github.com/prometheus/client_model v0.3.0 // indirect
178-
github.com/prometheus/common v0.37.0 // indirect
179-
github.com/prometheus/procfs v0.8.0 // indirect
178+
github.com/prometheus/client_model v0.4.0 // indirect
179+
github.com/prometheus/common v0.44.0 // indirect
180+
github.com/prometheus/procfs v0.10.1 // indirect
180181
github.com/rivo/uniseg v0.4.2 // indirect
181182
github.com/rubenv/sql-migrate v1.3.1 // indirect
182183
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -185,15 +186,15 @@ require (
185186
github.com/spf13/jwalterweatherman v1.1.0 // indirect
186187
github.com/stoewer/go-strcase v1.2.0 // indirect
187188
github.com/subosito/gotenv v1.2.0 // indirect
188-
github.com/vbatts/tar-split v0.11.2 // indirect
189+
github.com/vbatts/tar-split v0.11.3 // indirect
189190
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
190191
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
191192
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
192-
github.com/xlab/treeprint v1.1.0 // indirect
193+
github.com/xlab/treeprint v1.2.0 // indirect
193194
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
194195
github.com/yvasiyarov/gorelic v0.0.7 // indirect
195196
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
196-
go.etcd.io/bbolt v1.3.6 // indirect
197+
go.etcd.io/bbolt v1.3.7 // indirect
197198
go.opencensus.io v0.24.0 // indirect
198199
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
199200
go.opentelemetry.io/otel v1.14.0 // indirect
@@ -204,37 +205,37 @@ require (
204205
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
205206
go.opentelemetry.io/otel/trace v1.14.0 // indirect
206207
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
207-
go.starlark.net v0.0.0-20221010140840-6bf6f0955179 // indirect
208-
go.uber.org/atomic v1.10.0 // indirect
209-
go.uber.org/multierr v1.8.0 // indirect
210-
go.uber.org/zap v1.24.0 // indirect
208+
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
209+
go.uber.org/multierr v1.11.0 // indirect
210+
go.uber.org/zap v1.25.0 // indirect
211211
golang.org/x/crypto v0.14.0 // indirect
212+
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
212213
golang.org/x/net v0.17.0 // indirect
213-
golang.org/x/oauth2 v0.6.0 // indirect
214+
golang.org/x/oauth2 v0.9.0 // indirect
214215
golang.org/x/sync v0.3.0 // indirect
215216
golang.org/x/sys v0.13.0 // indirect
216217
golang.org/x/term v0.13.0 // indirect
217218
golang.org/x/time v0.3.0 // indirect
218-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
219+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
219220
gomodules.xyz/orderedmap v0.1.0 // indirect
220221
google.golang.org/appengine v1.6.7 // indirect
221-
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
222-
google.golang.org/grpc v1.53.0 // indirect
223-
google.golang.org/protobuf v1.29.1 // indirect
222+
google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 // indirect
223+
google.golang.org/grpc v1.54.0 // indirect
224+
google.golang.org/protobuf v1.30.0 // indirect
224225
gopkg.in/inf.v0 v0.9.1 // indirect
225226
gopkg.in/ini.v1 v1.66.2 // indirect
226227
gopkg.in/warnings.v0 v0.1.2 // indirect
227228
gopkg.in/yaml.v2 v2.4.0 // indirect
228229
gopkg.in/yaml.v3 v3.0.1 // indirect
229-
k8s.io/apiserver v0.26.10 // indirect
230-
k8s.io/component-base v0.26.10 // indirect
231-
k8s.io/klog/v2 v2.90.1 // indirect
232-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
233-
oras.land/oras-go v1.2.2 // indirect
234-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
235-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
236-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
237-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
230+
k8s.io/apiserver v0.27.7 // indirect
231+
k8s.io/component-base v0.27.7 // indirect
232+
k8s.io/klog/v2 v2.100.1 // indirect
233+
k8s.io/kube-openapi v0.0.0-20230515121852-a1ae96baeb76 // indirect
234+
oras.land/oras-go v1.2.4 // indirect
235+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
236+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
237+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
238+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
238239
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
239240
)
240241

@@ -244,4 +245,5 @@ replace (
244245
// latest tag resolves to a very old version. this is only used for spinning up local test registries
245246
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
246247
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
248+
sigs.k8s.io/kubebuilder/v3 => sigs.k8s.io/kubebuilder/v3 v3.11.1
247249
)

0 commit comments

Comments
 (0)