Skip to content

Commit 5f4fc89

Browse files
authored
Update cluster-api/hack/tools (#540)
1 parent 4a686e0 commit 5f4fc89

File tree

2 files changed

+644
-71
lines changed

2 files changed

+644
-71
lines changed

hack/tools/go.mod

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/onsi/ginkgo v1.16.5
1212
gotest.tools/gotestsum v1.6.4
1313
k8s.io/code-generator v0.23.0
14-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20211118171502-aafa086da595
14+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220202130822-e2aafb60cdf7
1515
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1616
sigs.k8s.io/controller-tools v0.8.0
1717
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1
@@ -22,6 +22,7 @@ require (
2222
github.com/BurntSushi/toml v0.3.1 // indirect
2323
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2424
github.com/Masterminds/semver v1.5.0 // indirect
25+
github.com/Microsoft/go-winio v0.5.1 // indirect
2526
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
2627
github.com/PuerkitoBio/purell v1.1.1 // indirect
2728
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -44,9 +45,9 @@ require (
4445
github.com/esimonov/ifshort v1.0.2 // indirect
4546
github.com/ettle/strcase v0.1.1 // indirect
4647
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
47-
github.com/fatih/color v1.12.0 // indirect
48+
github.com/fatih/color v1.13.0 // indirect
4849
github.com/fatih/structtag v1.2.0 // indirect
49-
github.com/fsnotify/fsnotify v1.4.9 // indirect
50+
github.com/fsnotify/fsnotify v1.5.1 // indirect
5051
github.com/fzipp/gocyclo v0.3.1 // indirect
5152
github.com/go-critic/go-critic v0.5.6 // indirect
5253
github.com/go-errors/errors v1.0.1 // indirect
@@ -64,7 +65,7 @@ require (
6465
github.com/go-toolsmith/strparse v1.0.0 // indirect
6566
github.com/go-toolsmith/typep v1.0.2 // indirect
6667
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
67-
github.com/gobuffalo/flect v0.2.3 // indirect
68+
github.com/gobuffalo/flect v0.2.4 // indirect
6869
github.com/gobwas/glob v0.2.3 // indirect
6970
github.com/gofrs/flock v0.8.0 // indirect
7071
github.com/gogo/protobuf v1.3.2 // indirect
@@ -79,7 +80,7 @@ require (
7980
github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect
8081
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
8182
github.com/google/go-cmp v0.5.6 // indirect
82-
github.com/google/gofuzz v1.1.0 // indirect
83+
github.com/google/gofuzz v1.2.0 // indirect
8384
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8485
github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
8586
github.com/gostaticanalysis/analysisutil v0.4.1 // indirect
@@ -89,7 +90,7 @@ require (
8990
github.com/hashicorp/errwrap v1.0.0 // indirect
9091
github.com/hashicorp/go-multierror v1.1.1 // indirect
9192
github.com/hashicorp/hcl v1.0.0 // indirect
92-
github.com/imdario/mergo v0.3.8 // indirect
93+
github.com/imdario/mergo v0.3.12 // indirect
9394
github.com/inconshreveable/mousetrap v1.0.0 // indirect
9495
github.com/itchyny/go-flags v1.5.0 // indirect
9596
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -101,7 +102,7 @@ require (
101102
github.com/josharian/intern v1.0.0 // indirect
102103
github.com/json-iterator/go v1.1.12 // indirect
103104
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
104-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
105+
github.com/kevinburke/ssh_config v1.1.0 // indirect
105106
github.com/kisielk/errcheck v1.6.0 // indirect
106107
github.com/kisielk/gotool v1.0.0 // indirect
107108
github.com/kulti/thelper v0.4.0 // indirect
@@ -113,15 +114,15 @@ require (
113114
github.com/mailru/easyjson v0.7.6 // indirect
114115
github.com/maratori/testpackage v1.0.1 // indirect
115116
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
116-
github.com/mattn/go-colorable v0.1.8 // indirect
117-
github.com/mattn/go-isatty v0.0.13 // indirect
118-
github.com/mattn/go-runewidth v0.0.9 // indirect
117+
github.com/mattn/go-colorable v0.1.9 // indirect
118+
github.com/mattn/go-isatty v0.0.14 // indirect
119+
github.com/mattn/go-runewidth v0.0.13 // indirect
119120
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
120121
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
121122
github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect
122123
github.com/mgechev/revive v1.0.7 // indirect
123124
github.com/mitchellh/go-homedir v1.1.0 // indirect
124-
github.com/mitchellh/mapstructure v1.4.1 // indirect
125+
github.com/mitchellh/mapstructure v1.4.2 // indirect
125126
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
126127
github.com/modern-go/reflect2 v1.0.2 // indirect
127128
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -132,7 +133,7 @@ require (
132133
github.com/nishanths/predeclared v0.2.1 // indirect
133134
github.com/nxadm/tail v1.4.8 // indirect
134135
github.com/olekukonko/tablewriter v0.0.5 // indirect
135-
github.com/pelletier/go-toml v1.9.3 // indirect
136+
github.com/pelletier/go-toml v1.9.4 // indirect
136137
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
137138
github.com/pkg/errors v0.9.1 // indirect
138139
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -143,6 +144,7 @@ require (
143144
github.com/prometheus/procfs v0.6.0 // indirect
144145
github.com/quasilyte/go-ruleguard v0.3.4 // indirect
145146
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
147+
github.com/rivo/uniseg v0.2.0 // indirect
146148
github.com/ryancurrah/gomodguard v1.2.2 // indirect
147149
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
148150
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
@@ -153,11 +155,11 @@ require (
153155
github.com/sonatard/noctx v0.0.1 // indirect
154156
github.com/sourcegraph/go-diff v0.6.1 // indirect
155157
github.com/spf13/afero v1.6.0 // indirect
156-
github.com/spf13/cast v1.3.1 // indirect
158+
github.com/spf13/cast v1.4.1 // indirect
157159
github.com/spf13/cobra v1.2.1 // indirect
158160
github.com/spf13/jwalterweatherman v1.1.0 // indirect
159161
github.com/spf13/pflag v1.0.5 // indirect
160-
github.com/spf13/viper v1.8.1 // indirect
162+
github.com/spf13/viper v1.9.0 // indirect
161163
github.com/src-d/gcfg v1.4.0 // indirect
162164
github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect
163165
github.com/stretchr/objx v0.2.0 // indirect
@@ -171,26 +173,28 @@ require (
171173
github.com/ultraware/funlen v0.0.3 // indirect
172174
github.com/ultraware/whitespace v0.0.4 // indirect
173175
github.com/uudashr/gocognit v1.0.1 // indirect
174-
github.com/xanzy/ssh-agent v0.2.1 // indirect
176+
github.com/xanzy/ssh-agent v0.3.0 // indirect
175177
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
176178
github.com/yeya24/promlinter v0.1.0 // indirect
177179
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
178180
go.uber.org/atomic v1.7.0 // indirect
181+
go.uber.org/goleak v1.1.12 // indirect
179182
go.uber.org/multierr v1.6.0 // indirect
180183
go.uber.org/zap v1.19.1 // indirect
181184
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
182185
golang.org/x/exp v0.0.0-20211029160041-3396431c207b // indirect
183186
golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
184-
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
187+
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect
185188
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
186-
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
189+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
187190
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
188191
golang.org/x/text v0.3.7 // indirect
189192
golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect
190193
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
191194
google.golang.org/protobuf v1.27.1 // indirect
195+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
192196
gopkg.in/inf.v0 v0.9.1 // indirect
193-
gopkg.in/ini.v1 v1.62.0 // indirect
197+
gopkg.in/ini.v1 v1.63.2 // indirect
194198
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
195199
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
196200
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
@@ -214,6 +218,11 @@ require (
214218
sigs.k8s.io/kustomize/api v0.10.1 // indirect
215219
sigs.k8s.io/kustomize/cmd/config v0.10.2 // indirect
216220
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
217-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
221+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
218222
sigs.k8s.io/yaml v1.3.0 // indirect
219223
)
224+
225+
replace (
226+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.0
227+
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.1.0
228+
)

0 commit comments

Comments
 (0)