Skip to content

Commit ec9289e

Browse files
tmshorttmshort
authored
Update client components (#1181)
go get k8s.io/client-go@latest go get k8s.io/cli-runtime@v0.31.0 go get sigs.k8s.io/controller-runtime@v0.19.0 go get github.com/operator-framework/operator-lib@v0.15.0 go get github.com/operator-framework/helm-operator-plugins@v0.5.0 bingo get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest Fixup defers of `SetFeatureGateDuringTest` Signed-off-by: Todd Short <tshort@redhat.com>
1 parent 1b65ec9 commit ec9289e

File tree

9 files changed

+154
-128
lines changed

9 files changed

+154
-128
lines changed

‎.bingo/Variables.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ $(OPM): $(BINGO_DIR)/opm.mod
6565
@echo "(re)installing $(GOBIN)/opm-v1.28.0"
6666
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opm.mod -o=$(GOBIN)/opm-v1.28.0 "github.com/operator-framework/operator-registry/cmd/opm"
6767

68-
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20230606045100-e54088c8c7da
68+
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20240820183333-e6c3d139d2b6
6969
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod
7070
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
71-
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20230606045100-e54088c8c7da"
72-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20230606045100-e54088c8c7da "sigs.k8s.io/controller-runtime/tools/setup-envtest"
71+
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20240820183333-e6c3d139d2b6"
72+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20240820183333-e6c3d139d2b6 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
7373

‎.bingo/setup-envtest.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.20
3+
go 1.22.0
44

5-
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230606045100-e54088c8c7da
5+
toolchain go1.22.2
6+
7+
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240820183333-e6c3d139d2b6

‎.bingo/setup-envtest.sum

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
55
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
6+
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
7+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
68
github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk=
79
github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro=
10+
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
11+
github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
12+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
813
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
914
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
1015
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -28,9 +33,13 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
2833
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
2934
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
3035
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
36+
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
37+
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
3138
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
3239
go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
3340
go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
41+
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
42+
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
3443
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3544
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
3645
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -52,6 +61,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5261
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
5362
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
5463
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
64+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
65+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
5566
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5667
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
5768
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -68,3 +79,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
6879
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
6980
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230606045100-e54088c8c7da h1:y2gbwqzbI7KIvPPgSOqC8K5PQOPBluyhD9hdNwPjp4U=
7081
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230606045100-e54088c8c7da/go.mod h1:B6HLcvOy2S1qq2eWOFm9xepiKPMIc8Z9OXSPsnUDaR4=
82+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240820183333-e6c3d139d2b6 h1:Wzx3QswG7gfzqPDw7Ec6/xvJGyoxAKUEoaxWLrk1V/I=
83+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240820183333-e6c3d139d2b6/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k=
84+
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
85+
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎.bingo/variables.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ OPERATOR_SDK="${GOBIN}/operator-sdk-v1.34.2"
2424

2525
OPM="${GOBIN}/opm-v1.28.0"
2626

27-
SETUP_ENVTEST="${GOBIN}/setup-envtest-v0.0.0-20230606045100-e54088c8c7da"
27+
SETUP_ENVTEST="${GOBIN}/setup-envtest-v0.0.0-20240820183333-e6c3d139d2b6"
2828

‎go.mod

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ require (
1313
github.com/google/go-containerregistry v0.20.2
1414
github.com/onsi/ginkgo/v2 v2.20.1
1515
github.com/onsi/gomega v1.34.1
16-
github.com/operator-framework/api v0.26.0
16+
github.com/operator-framework/api v0.27.0
1717
github.com/operator-framework/catalogd v0.20.0
18-
github.com/operator-framework/helm-operator-plugins v0.4.0
18+
github.com/operator-framework/helm-operator-plugins v0.5.0
1919
github.com/operator-framework/operator-registry v1.45.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.9.0
2222
go.uber.org/zap v1.27.0
2323
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
2424
gopkg.in/yaml.v2 v2.4.0
2525
helm.sh/helm/v3 v3.15.4
26-
k8s.io/api v0.30.3
27-
k8s.io/apiextensions-apiserver v0.30.3
28-
k8s.io/apimachinery v0.30.3
29-
k8s.io/cli-runtime v0.30.3
30-
k8s.io/client-go v0.30.3
31-
k8s.io/component-base v0.30.3
26+
k8s.io/api v0.31.0
27+
k8s.io/apiextensions-apiserver v0.31.0
28+
k8s.io/apimachinery v0.31.0
29+
k8s.io/cli-runtime v0.31.0
30+
k8s.io/client-go v0.31.0
31+
k8s.io/component-base v0.31.0
3232
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
33-
sigs.k8s.io/controller-runtime v0.18.4
33+
sigs.k8s.io/controller-runtime v0.19.0
3434
sigs.k8s.io/yaml v1.4.0
3535
)
3636

@@ -45,10 +45,10 @@ require (
4545
github.com/Masterminds/squirrel v1.5.4 // indirect
4646
github.com/Microsoft/go-winio v0.6.2 // indirect
4747
github.com/Microsoft/hcsshim v0.12.3 // indirect
48-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
48+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4949
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5050
github.com/beorn7/perks v1.0.1 // indirect
51-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
51+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5252
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5353
github.com/chai2010/gettext-go v1.0.2 // indirect
5454
github.com/containerd/cgroups/v3 v3.0.3 // indirect
@@ -84,6 +84,7 @@ require (
8484
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8585
github.com/fatih/color v1.15.0 // indirect
8686
github.com/felixge/httpsnoop v1.0.4 // indirect
87+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8788
github.com/go-errors/errors v1.4.2 // indirect
8889
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8990
github.com/go-git/go-billy/v5 v5.5.0 // indirect
@@ -100,7 +101,7 @@ require (
100101
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
101102
github.com/golang/protobuf v1.5.4 // indirect
102103
github.com/google/btree v1.1.2 // indirect
103-
github.com/google/cel-go v0.17.8 // indirect
104+
github.com/google/cel-go v0.20.1 // indirect
104105
github.com/google/gnostic-models v0.6.8 // indirect
105106
github.com/google/gofuzz v1.2.0 // indirect
106107
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
@@ -110,7 +111,7 @@ require (
110111
github.com/gorilla/websocket v1.5.0 // indirect
111112
github.com/gosuri/uitable v0.0.4 // indirect
112113
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
113-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
114+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
114115
github.com/h2non/filetype v1.1.3 // indirect
115116
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
116117
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -140,7 +141,7 @@ require (
140141
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
141142
github.com/mitchellh/reflectwalk v1.0.2 // indirect
142143
github.com/moby/locker v1.0.1 // indirect
143-
github.com/moby/spdystream v0.2.0 // indirect
144+
github.com/moby/spdystream v0.4.0 // indirect
144145
github.com/moby/sys/mountinfo v0.7.1 // indirect
145146
github.com/moby/sys/sequential v0.5.0 // indirect
146147
github.com/moby/sys/user v0.1.0 // indirect
@@ -154,15 +155,15 @@ require (
154155
github.com/opencontainers/image-spec v1.1.0 // indirect
155156
github.com/opencontainers/runtime-spec v1.2.0 // indirect
156157
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 // indirect
157-
github.com/operator-framework/operator-lib v0.14.0 // indirect
158+
github.com/operator-framework/operator-lib v0.15.0 // indirect
158159
github.com/otiai10/copy v1.14.0 // indirect
159160
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
160161
github.com/pkg/errors v0.9.1 // indirect
161162
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
162-
github.com/prometheus/client_golang v1.19.1 // indirect
163+
github.com/prometheus/client_golang v1.20.2 // indirect
163164
github.com/prometheus/client_model v0.6.1 // indirect
164-
github.com/prometheus/common v0.51.1 // indirect
165-
github.com/prometheus/procfs v0.12.0 // indirect
165+
github.com/prometheus/common v0.55.0 // indirect
166+
github.com/prometheus/procfs v0.15.1 // indirect
166167
github.com/rivo/uniseg v0.4.7 // indirect
167168
github.com/rubenv/sql-migrate v1.5.2 // indirect
168169
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -176,25 +177,26 @@ require (
176177
github.com/vbatts/tar-split v0.11.5 // indirect
177178
github.com/vito/go-interact v1.0.1 // indirect
178179
github.com/vmware-tanzu/carvel-kapp-controller v0.51.0 // indirect
180+
github.com/x448/float16 v0.8.4 // indirect
179181
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
180182
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
181183
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
182184
github.com/xlab/treeprint v1.2.0 // indirect
183185
go.etcd.io/bbolt v1.3.10 // indirect
184186
go.opencensus.io v0.24.0 // indirect
185-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
186-
go.opentelemetry.io/otel v1.24.0 // indirect
187-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
188-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
189-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
190-
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
191-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
192-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
187+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
188+
go.opentelemetry.io/otel v1.28.0 // indirect
189+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
191+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
192+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
193+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
194+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
193195
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
194196
go.uber.org/multierr v1.11.0 // indirect
195197
golang.org/x/crypto v0.26.0 // indirect
196198
golang.org/x/net v0.28.0 // indirect
197-
golang.org/x/oauth2 v0.20.0 // indirect
199+
golang.org/x/oauth2 v0.21.0 // indirect
198200
golang.org/x/sync v0.8.0 // indirect
199201
golang.org/x/sys v0.23.0 // indirect
200202
golang.org/x/term v0.23.0 // indirect
@@ -204,21 +206,21 @@ require (
204206
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
205207
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
206208
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
207-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
209+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
208210
google.golang.org/grpc v1.65.0 // indirect
209211
google.golang.org/protobuf v1.34.2 // indirect
210-
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
212+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
211213
gopkg.in/inf.v0 v0.9.1 // indirect
212214
gopkg.in/warnings.v0 v0.1.2 // indirect
213215
gopkg.in/yaml.v3 v3.0.1 // indirect
214-
k8s.io/apiserver v0.30.3 // indirect
215-
k8s.io/klog/v2 v2.120.1 // indirect
216+
k8s.io/apiserver v0.31.0 // indirect
217+
k8s.io/klog/v2 v2.130.1 // indirect
216218
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
217219
k8s.io/kubectl v0.30.3 // indirect
218220
oras.land/oras-go v1.2.5 // indirect
219-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
221+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
220222
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
221-
sigs.k8s.io/kustomize/api v0.15.0 // indirect
222-
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
223+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
224+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
223225
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
224226
)

0 commit comments

Comments
 (0)