Skip to content

Commit 52a965a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1297 from damdo/bump-resourcebuilder
NO-JIRA: Bump cluster-api-actuator-pkg/testutils, use envtest --index
2 parents 2d3b8b1 + 88ec3cb commit 52a965a

File tree

621 files changed

+29708
-17232
lines changed

Some content is hidden

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

621 files changed

+29708
-17232
lines changed

‎Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ MUTABLE_TAG ?= latest
55
IMAGE = $(REGISTRY)machine-api-operator
66
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.22
77
GOLANGCI_LINT = go run ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
8+
ENVTEST_K8S_VERSION = 1.31.1
89

910
# Enable go modules and vendoring
1011
# https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support
@@ -55,7 +56,6 @@ endif
5556
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
5657
ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest
5758
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
58-
ENVTEST_K8S_VERSION = 1.29.1
5959

6060
.PHONY: vendor
6161
vendor:
@@ -103,8 +103,7 @@ test-sec:
103103
test: unit
104104

105105
unit:
106-
# GCS bucket support will be going away, but explicitly enable it to use our own bucket.
107-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --use-deprecated-gcs=true -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
106+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --index https://raw.githubusercontent.com/openshift/api/master/envtest-releases.yaml)" ./hack/ci-test.sh
108107

109108
.PHONY: image
110109
image: ## Build docker image

‎go.mod

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,60 @@
11
module github.com/openshift/machine-api-operator
22

3-
go 1.22.0
3+
go 1.22.1
44

55
toolchain go1.22.3
66

77
require (
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/go-logr/logr v1.4.2
10+
github.com/golangci/golangci-lint v1.61.0
1011
github.com/google/uuid v1.6.0
11-
github.com/onsi/ginkgo/v2 v2.19.0
12-
github.com/onsi/gomega v1.33.1
13-
github.com/openshift/api v0.0.0-20240919193929-2669d1ebc910
12+
github.com/onsi/ginkgo/v2 v2.20.2
13+
github.com/onsi/gomega v1.34.2
14+
github.com/openshift/api v0.0.0-20240924155631-232984653385
1415
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd
16+
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20241007145816-7038c320d36c
17+
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240909043600-373ac49835bf
1518
github.com/openshift/library-go v0.0.0-20240919205913-c96b82b3762b
1619
github.com/prometheus/client_golang v1.19.1
1720
github.com/spf13/cobra v1.8.1
1821
github.com/spf13/pflag v1.0.5
1922
github.com/stretchr/testify v1.9.0
2023
github.com/vmware/govmomi v0.39.0
21-
golang.org/x/net v0.26.0
24+
golang.org/x/net v0.28.0
25+
golang.org/x/time v0.6.0
2226
gopkg.in/gcfg.v1 v1.2.3 // indirect
2327
k8s.io/api v0.31.1
2428
k8s.io/apimachinery v0.31.1
2529
k8s.io/apiserver v0.31.1
2630
k8s.io/client-go v0.31.1
2731
k8s.io/cloud-provider-vsphere v1.31.0
32+
k8s.io/component-base v0.31.1
2833
k8s.io/klog/v2 v2.130.1
2934
k8s.io/kubectl v0.31.1
3035
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3136
sigs.k8s.io/cluster-api v1.6.1
3237
sigs.k8s.io/controller-runtime v0.19.0
33-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240522175850-2e9781e9fc60
34-
sigs.k8s.io/yaml v1.4.0
35-
)
36-
37-
require (
38-
github.com/golangci/golangci-lint v1.58.2
39-
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20240626103413-ddea9c7c0aca
40-
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240909043600-373ac49835bf
41-
golang.org/x/time v0.5.0
42-
k8s.io/component-base v0.31.1
38+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
4339
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
40+
sigs.k8s.io/yaml v1.4.0
4441
)
4542

4643
require (
4744
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
4845
4d63.com/gochecknoglobals v0.2.1 // indirect
4946
github.com/4meepo/tagalign v1.3.4 // indirect
50-
github.com/Abirdcfly/dupword v0.0.14 // indirect
47+
github.com/Abirdcfly/dupword v0.1.1 // indirect
5148
github.com/Antonboom/errname v0.1.13 // indirect
5249
github.com/Antonboom/nilnil v0.1.9 // indirect
53-
github.com/Antonboom/testifylint v1.2.0 // indirect
50+
github.com/Antonboom/testifylint v1.4.3 // indirect
5451
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
55-
github.com/BurntSushi/toml v1.3.2 // indirect
56-
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
52+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
53+
github.com/Crocmagnon/fatcontext v0.5.2 // indirect
5754
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
58-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
55+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
5956
github.com/MakeNowJust/heredoc v1.0.0 // indirect
60-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
57+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
6158
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
6259
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
6360
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
@@ -69,7 +66,7 @@ require (
6966
github.com/bkielbasa/cyclop v1.2.1 // indirect
7067
github.com/blang/semver/v4 v4.0.0 // indirect
7168
github.com/blizzy78/varnamelen v0.8.0 // indirect
72-
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
69+
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
7370
github.com/breml/bidichk v0.2.7 // indirect
7471
github.com/breml/errchkjson v0.3.6 // indirect
7572
github.com/butuzov/ireturn v0.3.0 // indirect
@@ -80,9 +77,9 @@ require (
8077
github.com/chai2010/gettext-go v1.0.2 // indirect
8178
github.com/charithe/durationcheck v0.0.10 // indirect
8279
github.com/chavacava/garif v0.1.0 // indirect
83-
github.com/ckaznocha/intrange v0.1.2 // indirect
80+
github.com/ckaznocha/intrange v0.2.0 // indirect
8481
github.com/curioswitch/go-reassign v0.2.0 // indirect
85-
github.com/daixiang0/gci v0.13.4 // indirect
82+
github.com/daixiang0/gci v0.13.5 // indirect
8683
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8784
github.com/denis-tingaikin/go-header v0.5.0 // indirect
8885
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
@@ -97,7 +94,7 @@ require (
9794
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
9895
github.com/fzipp/gocyclo v0.6.0 // indirect
9996
github.com/ghostiam/protogetter v0.3.6 // indirect
100-
github.com/go-critic/go-critic v0.11.3 // indirect
97+
github.com/go-critic/go-critic v0.11.4 // indirect
10198
github.com/go-errors/errors v1.4.2 // indirect
10299
github.com/go-logr/zapr v1.3.0 // indirect
103100
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -112,16 +109,16 @@ require (
112109
github.com/go-toolsmith/astp v1.1.0 // indirect
113110
github.com/go-toolsmith/strparse v1.1.0 // indirect
114111
github.com/go-toolsmith/typep v1.1.0 // indirect
115-
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
112+
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
116113
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
117114
github.com/gobwas/glob v0.2.3 // indirect
118-
github.com/gofrs/flock v0.8.1 // indirect
115+
github.com/gofrs/flock v0.12.1 // indirect
119116
github.com/gogo/protobuf v1.3.2 // indirect
120117
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
121118
github.com/golang/protobuf v1.5.4 // indirect
122119
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
123-
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
124-
github.com/golangci/misspell v0.5.1 // indirect
120+
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
121+
github.com/golangci/misspell v0.6.0 // indirect
125122
github.com/golangci/modinfo v0.3.4 // indirect
126123
github.com/golangci/plugin-module-register v0.1.1 // indirect
127124
github.com/golangci/revgrep v0.5.3 // indirect
@@ -130,7 +127,7 @@ require (
130127
github.com/google/gnostic-models v0.6.8 // indirect
131128
github.com/google/go-cmp v0.6.0 // indirect
132129
github.com/google/gofuzz v1.2.0 // indirect
133-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
130+
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
134131
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
135132
github.com/gordonklaus/ineffassign v0.1.0 // indirect
136133
github.com/gorilla/websocket v1.5.0 // indirect
@@ -139,15 +136,15 @@ require (
139136
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
140137
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
141138
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
142-
github.com/hashicorp/go-version v1.6.0 // indirect
139+
github.com/hashicorp/go-version v1.7.0 // indirect
143140
github.com/hashicorp/hcl v1.0.0 // indirect
144141
github.com/hexops/gotextdiff v1.0.3 // indirect
145142
github.com/imdario/mergo v0.3.15 // indirect
146143
github.com/inconshreveable/mousetrap v1.1.0 // indirect
147144
github.com/jgautheron/goconst v1.7.1 // indirect
148145
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
149146
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
150-
github.com/jjti/go-spancheck v0.6.1 // indirect
147+
github.com/jjti/go-spancheck v0.6.2 // indirect
151148
github.com/josharian/intern v1.0.0 // indirect
152149
github.com/json-iterator/go v1.1.12 // indirect
153150
github.com/julz/importas v0.1.0 // indirect
@@ -172,7 +169,7 @@ require (
172169
github.com/mattn/go-colorable v0.1.13 // indirect
173170
github.com/mattn/go-isatty v0.0.20 // indirect
174171
github.com/mattn/go-runewidth v0.0.14 // indirect
175-
github.com/mgechev/revive v1.3.7 // indirect
172+
github.com/mgechev/revive v1.3.9 // indirect
176173
github.com/mitchellh/go-homedir v1.1.0 // indirect
177174
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
178175
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -181,43 +178,43 @@ require (
181178
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
182179
github.com/modern-go/reflect2 v1.0.2 // indirect
183180
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
184-
github.com/moricho/tparallel v0.3.1 // indirect
181+
github.com/moricho/tparallel v0.3.2 // indirect
185182
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
186183
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
187184
github.com/nakabonne/nestif v0.3.1 // indirect
188185
github.com/nishanths/exhaustive v0.12.0 // indirect
189186
github.com/nishanths/predeclared v0.2.2 // indirect
190187
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
191188
github.com/olekukonko/tablewriter v0.0.5 // indirect
192-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
189+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
193190
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
194191
github.com/pkg/errors v0.9.1 // indirect
195192
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
196-
github.com/polyfloyd/go-errorlint v1.5.1 // indirect
193+
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
197194
github.com/prometheus/client_model v0.6.1 // indirect
198195
github.com/prometheus/common v0.55.0 // indirect
199196
github.com/prometheus/procfs v0.15.1 // indirect
200-
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
197+
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
201198
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
202199
github.com/quasilyte/gogrep v0.5.0 // indirect
203200
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
204201
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
205202
github.com/rivo/uniseg v0.4.2 // indirect
206203
github.com/robfig/cron v1.2.0 // indirect
207204
github.com/russross/blackfriday/v2 v2.1.0 // indirect
208-
github.com/ryancurrah/gomodguard v1.3.2 // indirect
205+
github.com/ryancurrah/gomodguard v1.3.5 // indirect
209206
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
210207
github.com/sagikazarmark/locafero v0.3.0 // indirect
211208
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
212209
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
213210
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
214211
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
215-
github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect
216-
github.com/securego/gosec/v2 v2.20.0 // indirect
212+
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
213+
github.com/securego/gosec/v2 v2.21.2 // indirect
217214
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
218215
github.com/sirupsen/logrus v1.9.3 // indirect
219216
github.com/sivchari/containedctx v1.0.3 // indirect
220-
github.com/sivchari/tenv v1.7.1 // indirect
217+
github.com/sivchari/tenv v1.10.0 // indirect
221218
github.com/sonatard/noctx v0.0.2 // indirect
222219
github.com/sourcegraph/conc v0.3.0 // indirect
223220
github.com/sourcegraph/go-diff v0.7.0 // indirect
@@ -228,16 +225,15 @@ require (
228225
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
229226
github.com/stretchr/objx v0.5.2 // indirect
230227
github.com/subosito/gotenv v1.6.0 // indirect
231-
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
232228
github.com/tdakkota/asciicheck v0.2.0 // indirect
233-
github.com/tetafro/godot v1.4.16 // indirect
229+
github.com/tetafro/godot v1.4.17 // indirect
234230
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
235231
github.com/timonwong/loggercheck v0.9.4 // indirect
236-
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
232+
github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
237233
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
238234
github.com/ultraware/funlen v0.1.0 // indirect
239235
github.com/ultraware/whitespace v0.1.1 // indirect
240-
github.com/uudashr/gocognit v1.1.2 // indirect
236+
github.com/uudashr/gocognit v1.1.3 // indirect
241237
github.com/x448/float16 v0.8.4 // indirect
242238
github.com/xen0n/gosmopolitan v1.2.2 // indirect
243239
github.com/xlab/treeprint v1.2.0 // indirect
@@ -246,20 +242,20 @@ require (
246242
github.com/ykadowak/zerologlint v0.1.5 // indirect
247243
gitlab.com/bosi/decorder v0.4.2 // indirect
248244
go-simpler.org/musttag v0.12.2 // indirect
249-
go-simpler.org/sloglint v0.6.0 // indirect
245+
go-simpler.org/sloglint v0.7.2 // indirect
250246
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
251247
go.uber.org/automaxprocs v1.5.3 // indirect
252248
go.uber.org/multierr v1.11.0 // indirect
253249
go.uber.org/zap v1.26.0 // indirect
254-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
250+
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
255251
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
256-
golang.org/x/mod v0.17.0 // indirect
257-
golang.org/x/oauth2 v0.21.0 // indirect
258-
golang.org/x/sync v0.7.0 // indirect
259-
golang.org/x/sys v0.21.0 // indirect
260-
golang.org/x/term v0.21.0 // indirect
261-
golang.org/x/text v0.16.0 // indirect
262-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
252+
golang.org/x/mod v0.21.0 // indirect
253+
golang.org/x/oauth2 v0.22.0 // indirect
254+
golang.org/x/sync v0.8.0 // indirect
255+
golang.org/x/sys v0.25.0 // indirect
256+
golang.org/x/term v0.23.0 // indirect
257+
golang.org/x/text v0.18.0 // indirect
258+
golang.org/x/tools v0.24.0 // indirect
263259
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
264260
google.golang.org/protobuf v1.34.2 // indirect
265261
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -268,13 +264,13 @@ require (
268264
gopkg.in/warnings.v0 v0.1.2 // indirect
269265
gopkg.in/yaml.v2 v2.4.0 // indirect
270266
gopkg.in/yaml.v3 v3.0.1 // indirect
271-
honnef.co/go/tools v0.4.7 // indirect
267+
honnef.co/go/tools v0.5.1 // indirect
272268
k8s.io/apiextensions-apiserver v0.31.0 // indirect
273269
k8s.io/cli-runtime v0.31.1 // indirect
274270
k8s.io/kube-aggregator v0.30.1 // indirect
275271
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
276-
mvdan.cc/gofumpt v0.6.0 // indirect
277-
mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect
272+
mvdan.cc/gofumpt v0.7.0 // indirect
273+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
278274
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
279275
sigs.k8s.io/kustomize/api v0.17.2 // indirect
280276
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect

0 commit comments

Comments
 (0)