Skip to content

Commit b6740b5

Browse files
jweite-amazonjweite-amazon
authored
Merge pull request #227 from hrak/go_1_19
Update to Go 1.19
2 parents 95ff824 + d71f0b7 commit b6740b5

File tree

7 files changed

+297
-706
lines changed

7 files changed

+297
-706
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ managers:
9595
manager-cloudstack-infrastructure: ## Build manager binary.
9696
CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -ldflags "${LDFLAGS} -extldflags '-static'" -o $(BIN_DIR)/manager .
9797

98-
export K8S_VERSION=1.19.2
98+
export K8S_VERSION=1.25.0
9999
$(KUBECTL) $(API_SERVER) $(ETCD) &:
100100
cd $(TOOLS_DIR) && curl --silent -L "https://go.kubebuilder.io/test-tools/${K8S_VERSION}/$(shell go env GOOS)/$(shell go env GOARCH)" --output - | \
101101
tar -C ./ --strip-components=1 -zvxf -
@@ -133,8 +133,8 @@ lint: $(GOLANGCI_LINT) $(STATIC_CHECK) generate-mocks ## Run linting for the pro
133133

134134
.PHONY: modules
135135
modules: ## Runs go mod to ensure proper vendoring.
136-
go mod tidy -compat=1.17
137-
cd $(TOOLS_DIR); go mod tidy -compat=1.17
136+
go mod tidy -compat=1.19
137+
cd $(TOOLS_DIR); go mod tidy -compat=1.19
138138

139139
.PHONY: generate-all
140140
generate-all: generate-mocks generate-deepcopy generate-manifests

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-cloudstack
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/ReneKroon/ttlcache v1.7.0

‎hack/tools/go.mod

Lines changed: 70 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/aws/cluster-api-provider-cloudstack/hack/tools
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/a8m/envsubst v1.3.0
77
github.com/golang/mock v1.6.0
8-
github.com/golangci/golangci-lint v1.46.2
8+
github.com/golangci/golangci-lint v1.50.1
99
github.com/onsi/ginkgo v1.16.5
10-
github.com/onsi/ginkgo/v2 v2.1.3
11-
honnef.co/go/tools v0.3.1
10+
github.com/onsi/ginkgo/v2 v2.1.4
11+
honnef.co/go/tools v0.3.3
1212
k8s.io/code-generator v0.23.5
1313
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220329062511-822f046dac13
1414
sigs.k8s.io/controller-tools v0.8.0
@@ -18,17 +18,19 @@ require (
1818

1919
require (
2020
4d63.com/gochecknoglobals v0.1.0 // indirect
21-
github.com/Antonboom/errname v0.1.6 // indirect
21+
github.com/Abirdcfly/dupword v0.0.7 // indirect
22+
github.com/Antonboom/errname v0.1.7 // indirect
2223
github.com/Antonboom/nilnil v0.1.1 // indirect
23-
github.com/BurntSushi/toml v1.1.0 // indirect
24+
github.com/BurntSushi/toml v1.2.1 // indirect
2425
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
25-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 // indirect
26+
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
2627
github.com/Masterminds/semver v1.5.0 // indirect
27-
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
28+
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
2829
github.com/PuerkitoBio/purell v1.1.1 // indirect
2930
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3031
github.com/alessio/shellescape v1.4.1 // indirect
3132
github.com/alexkohler/prealloc v1.0.0 // indirect
33+
github.com/alingse/asasalint v0.0.11 // indirect
3234
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3335
github.com/ashanbrown/forbidigo v1.3.0 // indirect
3436
github.com/ashanbrown/makezero v1.1.1 // indirect
@@ -42,8 +44,9 @@ require (
4244
github.com/butuzov/ireturn v0.1.1 // indirect
4345
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4446
github.com/charithe/durationcheck v0.0.9 // indirect
45-
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
46-
github.com/daixiang0/gci v0.3.3 // indirect
47+
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
48+
github.com/curioswitch/go-reassign v0.2.0 // indirect
49+
github.com/daixiang0/gci v0.8.1 // indirect
4750
github.com/davecgh/go-spew v1.1.1 // indirect
4851
github.com/denis-tingaikin/go-header v0.4.3 // indirect
4952
github.com/esimonov/ifshort v1.0.4 // indirect
@@ -52,19 +55,19 @@ require (
5255
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5356
github.com/fatih/color v1.13.0 // indirect
5457
github.com/fatih/structtag v1.2.0 // indirect
55-
github.com/firefart/nonamedreturns v1.0.1 // indirect
58+
github.com/firefart/nonamedreturns v1.0.4 // indirect
5659
github.com/fsnotify/fsnotify v1.5.4 // indirect
57-
github.com/fzipp/gocyclo v0.5.1 // indirect
58-
github.com/go-critic/go-critic v0.6.3 // indirect
60+
github.com/fzipp/gocyclo v0.6.0 // indirect
61+
github.com/go-critic/go-critic v0.6.5 // indirect
5962
github.com/go-errors/errors v1.0.1 // indirect
6063
github.com/go-logr/logr v1.2.0 // indirect
6164
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6265
github.com/go-openapi/jsonreference v0.19.5 // indirect
6366
github.com/go-openapi/swag v0.19.14 // indirect
6467
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
6568
github.com/go-toolsmith/astcast v1.0.0 // indirect
66-
github.com/go-toolsmith/astcopy v1.0.0 // indirect
67-
github.com/go-toolsmith/astequal v1.0.1 // indirect
69+
github.com/go-toolsmith/astcopy v1.0.2 // indirect
70+
github.com/go-toolsmith/astequal v1.0.3 // indirect
6871
github.com/go-toolsmith/astfmt v1.0.0 // indirect
6972
github.com/go-toolsmith/astp v1.0.0 // indirect
7073
github.com/go-toolsmith/strparse v1.0.0 // indirect
@@ -78,13 +81,13 @@ require (
7881
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
7982
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
8083
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
81-
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
84+
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
8285
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
8386
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
8487
github.com/golangci/misspell v0.3.5 // indirect
85-
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
88+
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
8689
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
87-
github.com/google/go-cmp v0.5.7 // indirect
90+
github.com/google/go-cmp v0.5.9 // indirect
8891
github.com/google/gofuzz v1.2.0 // indirect
8992
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
9093
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -95,36 +98,38 @@ require (
9598
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
9699
github.com/hashicorp/errwrap v1.0.0 // indirect
97100
github.com/hashicorp/go-multierror v1.1.1 // indirect
98-
github.com/hashicorp/go-version v1.4.0 // indirect
101+
github.com/hashicorp/go-version v1.6.0 // indirect
99102
github.com/hashicorp/hcl v1.0.0 // indirect
100103
github.com/hexops/gotextdiff v1.0.3 // indirect
101104
github.com/imdario/mergo v0.3.12 // indirect
102-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
105+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
103106
github.com/jgautheron/goconst v1.5.1 // indirect
104107
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
105108
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
106109
github.com/josharian/intern v1.0.0 // indirect
107110
github.com/json-iterator/go v1.1.12 // indirect
108111
github.com/julz/importas v0.1.0 // indirect
109-
github.com/kisielk/errcheck v1.6.0 // indirect
112+
github.com/kisielk/errcheck v1.6.2 // indirect
110113
github.com/kisielk/gotool v1.0.0 // indirect
111-
github.com/kulti/thelper v0.6.2 // indirect
112-
github.com/kunwardeep/paralleltest v1.0.3 // indirect
114+
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
115+
github.com/kulti/thelper v0.6.3 // indirect
116+
github.com/kunwardeep/paralleltest v1.0.6 // indirect
113117
github.com/kyoh86/exportloopref v0.1.8 // indirect
114118
github.com/ldez/gomoddirectives v0.2.3 // indirect
115119
github.com/ldez/tagliatelle v0.3.1 // indirect
116120
github.com/leonklingele/grouper v1.1.0 // indirect
117121
github.com/lufeee/execinquery v1.2.1 // indirect
118122
github.com/magiconair/properties v1.8.6 // indirect
119123
github.com/mailru/easyjson v0.7.6 // indirect
120-
github.com/maratori/testpackage v1.0.1 // indirect
124+
github.com/maratori/testableexamples v1.0.0 // indirect
125+
github.com/maratori/testpackage v1.1.0 // indirect
121126
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
122-
github.com/mattn/go-colorable v0.1.12 // indirect
123-
github.com/mattn/go-isatty v0.0.14 // indirect
127+
github.com/mattn/go-colorable v0.1.13 // indirect
128+
github.com/mattn/go-isatty v0.0.16 // indirect
124129
github.com/mattn/go-runewidth v0.0.9 // indirect
125130
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
126131
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
127-
github.com/mgechev/revive v1.2.1 // indirect
132+
github.com/mgechev/revive v1.2.4 // indirect
128133
github.com/mitchellh/go-homedir v1.1.0 // indirect
129134
github.com/mitchellh/mapstructure v1.5.0 // indirect
130135
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -133,84 +138,90 @@ require (
133138
github.com/moricho/tparallel v0.2.1 // indirect
134139
github.com/nakabonne/nestif v0.3.1 // indirect
135140
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
136-
github.com/nishanths/exhaustive v0.7.11 // indirect
141+
github.com/nishanths/exhaustive v0.8.3 // indirect
137142
github.com/nishanths/predeclared v0.2.2 // indirect
138143
github.com/nxadm/tail v1.4.8 // indirect
139144
github.com/olekukonko/tablewriter v0.0.5 // indirect
140145
github.com/pelletier/go-toml v1.9.5 // indirect
141-
github.com/pelletier/go-toml/v2 v2.0.0 // indirect
146+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
142147
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
143148
github.com/pkg/errors v0.9.1 // indirect
144149
github.com/pmezard/go-difflib v1.0.0 // indirect
145-
github.com/polyfloyd/go-errorlint v1.0.0 // indirect
150+
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
146151
github.com/prometheus/client_golang v1.12.1 // indirect
147152
github.com/prometheus/client_model v0.2.0 // indirect
148153
github.com/prometheus/common v0.32.1 // indirect
149154
github.com/prometheus/procfs v0.7.3 // indirect
150-
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
151-
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
155+
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
156+
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
152157
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
153158
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
154-
github.com/ryancurrah/gomodguard v1.2.3 // indirect
159+
github.com/ryancurrah/gomodguard v1.2.4 // indirect
155160
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
156161
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
157-
github.com/securego/gosec/v2 v2.11.0 // indirect
162+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
163+
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
164+
github.com/securego/gosec/v2 v2.13.1 // indirect
158165
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
159-
github.com/sirupsen/logrus v1.8.1 // indirect
166+
github.com/sirupsen/logrus v1.9.0 // indirect
160167
github.com/sivchari/containedctx v1.0.2 // indirect
161-
github.com/sivchari/tenv v1.5.0 // indirect
168+
github.com/sivchari/nosnakecase v1.7.0 // indirect
169+
github.com/sivchari/tenv v1.7.0 // indirect
162170
github.com/sonatard/noctx v0.0.1 // indirect
163171
github.com/sourcegraph/go-diff v0.6.1 // indirect
164172
github.com/spf13/afero v1.8.2 // indirect
165-
github.com/spf13/cast v1.4.1 // indirect
166-
github.com/spf13/cobra v1.4.0 // indirect
173+
github.com/spf13/cast v1.5.0 // indirect
174+
github.com/spf13/cobra v1.6.0 // indirect
167175
github.com/spf13/jwalterweatherman v1.1.0 // indirect
168176
github.com/spf13/pflag v1.0.5 // indirect
169-
github.com/spf13/viper v1.11.0 // indirect
177+
github.com/spf13/viper v1.12.0 // indirect
170178
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
171179
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
172-
github.com/stretchr/objx v0.2.0 // indirect
173-
github.com/stretchr/testify v1.7.1 // indirect
174-
github.com/subosito/gotenv v1.2.0 // indirect
175-
github.com/sylvia7788/contextcheck v1.0.4 // indirect
180+
github.com/stretchr/objx v0.4.0 // indirect
181+
github.com/stretchr/testify v1.8.0 // indirect
182+
github.com/subosito/gotenv v1.4.1 // indirect
176183
github.com/tdakkota/asciicheck v0.1.1 // indirect
177184
github.com/tetafro/godot v1.4.11 // indirect
178185
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
179-
github.com/tomarrell/wrapcheck/v2 v2.6.1 // indirect
180-
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
186+
github.com/timonwong/loggercheck v0.9.3 // indirect
187+
github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect
188+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
181189
github.com/ultraware/funlen v0.0.3 // indirect
182190
github.com/ultraware/whitespace v0.0.5 // indirect
183-
github.com/uudashr/gocognit v1.0.5 // indirect
191+
github.com/uudashr/gocognit v1.0.6 // indirect
184192
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
185193
github.com/yagipy/maintidx v1.0.0 // indirect
186194
github.com/yeya24/promlinter v0.2.0 // indirect
187-
gitlab.com/bosi/decorder v0.2.1 // indirect
195+
gitlab.com/bosi/decorder v0.2.3 // indirect
188196
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
189-
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
190-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
191-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
192-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
193-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
194-
golang.org/x/text v0.3.7 // indirect
195-
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
196-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
197+
go.uber.org/atomic v1.7.0 // indirect
198+
go.uber.org/multierr v1.6.0 // indirect
199+
go.uber.org/zap v1.19.0 // indirect
200+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
201+
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
202+
golang.org/x/mod v0.6.0 // indirect
203+
golang.org/x/net v0.1.0 // indirect
204+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
205+
golang.org/x/sys v0.1.0 // indirect
206+
golang.org/x/text v0.4.0 // indirect
207+
golang.org/x/tools v0.2.0 // indirect
197208
google.golang.org/protobuf v1.28.0 // indirect
198209
gopkg.in/inf.v0 v0.9.1 // indirect
199-
gopkg.in/ini.v1 v1.66.4 // indirect
210+
gopkg.in/ini.v1 v1.67.0 // indirect
200211
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
201212
gopkg.in/yaml.v2 v2.4.0 // indirect
202-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
213+
gopkg.in/yaml.v3 v3.0.1 // indirect
203214
k8s.io/api v0.23.0 // indirect
204215
k8s.io/apiextensions-apiserver v0.23.0 // indirect
205216
k8s.io/apimachinery v0.23.0 // indirect
206217
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
207218
k8s.io/klog/v2 v2.30.0 // indirect
208219
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
209220
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
210-
mvdan.cc/gofumpt v0.3.1 // indirect
221+
mvdan.cc/gofumpt v0.4.0 // indirect
211222
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
212223
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
213-
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
224+
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
214225
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
215226
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
216227
sigs.k8s.io/kustomize/api v0.11.4 // indirect

0 commit comments

Comments
 (0)