Skip to content

Commit 1131378

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17911 from justinsb/fix_hack_tools_for_vulncheck
Use go get -tool instead of hack/tools.go
2 parents 14d271e + 3ae01ec commit 1131378

8 files changed

Lines changed: 171 additions & 184 deletions

hack/tools.go renamed to hack/doc.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2020 The Kubernetes Authors.
2+
Copyright The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,16 +14,5 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package manages our go mod tools dependencies.
1718
package hack
18-
19-
import (
20-
_ "github.com/client9/misspell/cmd/misspell"
21-
22-
_ "golang.org/x/tools/cmd/goimports"
23-
24-
_ "honnef.co/go/tools/cmd/staticcheck"
25-
26-
_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
27-
28-
_ "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
29-
)

‎hack/go.mod‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ module k8s.io/kops/hack
22

33
go 1.25.6
44

5-
require (
6-
github.com/client9/misspell v0.3.4
7-
github.com/golangci/golangci-lint/v2 v2.7.2
8-
golang.org/x/tools v0.40.0
9-
honnef.co/go/tools v0.6.1
10-
sigs.k8s.io/controller-tools v0.19.0
5+
tool (
6+
github.com/client9/misspell/cmd/misspell
7+
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
8+
golang.org/x/tools/cmd/goimports
9+
honnef.co/go/tools/cmd/staticcheck
10+
sigs.k8s.io/controller-tools/cmd/controller-gen
1111
)
1212

1313
require (
1414
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
1515
4d63.com/gochecknoglobals v0.2.2 // indirect
1616
codeberg.org/chavacava/garif v0.2.0 // indirect
17+
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
1718
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
1819
dev.gaijin.team/go/golib v0.6.0 // indirect
1920
github.com/4meepo/tagalign v1.4.3 // indirect
@@ -23,15 +24,15 @@ require (
2324
github.com/Antonboom/errname v1.1.1 // indirect
2425
github.com/Antonboom/nilnil v1.1.1 // indirect
2526
github.com/Antonboom/testifylint v1.6.4 // indirect
26-
github.com/BurntSushi/toml v1.5.0 // indirect
27+
github.com/BurntSushi/toml v1.6.0 // indirect
2728
github.com/Djarvur/go-err113 v0.1.1 // indirect
2829
github.com/Masterminds/semver/v3 v3.4.0 // indirect
29-
github.com/MirrexOne/unqueryvet v1.3.0 // indirect
30+
github.com/MirrexOne/unqueryvet v1.4.0 // indirect
3031
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
31-
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
32+
github.com/alecthomas/chroma/v2 v2.21.1 // indirect
3233
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
3334
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
34-
github.com/alexkohler/prealloc v1.0.0 // indirect
35+
github.com/alexkohler/prealloc v1.0.1 // indirect
3536
github.com/alfatraining/structtag v1.0.0 // indirect
3637
github.com/alingse/asasalint v0.0.11 // indirect
3738
github.com/alingse/nilnesserr v0.2.0 // indirect
@@ -57,10 +58,11 @@ require (
5758
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
5859
github.com/charmbracelet/x/term v0.2.1 // indirect
5960
github.com/ckaznocha/intrange v0.3.1 // indirect
61+
github.com/client9/misspell v0.3.4 // indirect
6062
github.com/curioswitch/go-reassign v0.3.0 // indirect
6163
github.com/daixiang0/gci v0.13.7 // indirect
6264
github.com/dave/dst v0.27.3 // indirect
63-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
65+
github.com/davecgh/go-spew v1.1.1 // indirect
6466
github.com/denis-tingaikin/go-header v0.5.0 // indirect
6567
github.com/dlclark/regexp2 v1.11.5 // indirect
6668
github.com/ettle/strcase v0.2.0 // indirect
@@ -70,8 +72,8 @@ require (
7072
github.com/fsnotify/fsnotify v1.9.0 // indirect
7173
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7274
github.com/fzipp/gocyclo v0.6.0 // indirect
73-
github.com/ghostiam/protogetter v0.3.17 // indirect
74-
github.com/go-critic/go-critic v0.14.2 // indirect
75+
github.com/ghostiam/protogetter v0.3.18 // indirect
76+
github.com/go-critic/go-critic v0.14.3 // indirect
7577
github.com/go-logr/logr v1.4.3 // indirect
7678
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7779
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -87,14 +89,14 @@ require (
8789
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
8890
github.com/gobuffalo/flect v1.0.3 // indirect
8991
github.com/gobwas/glob v0.2.3 // indirect
90-
github.com/godoc-lint/godoc-lint v0.10.2 // indirect
92+
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
9193
github.com/gofrs/flock v0.13.0 // indirect
92-
github.com/gogo/protobuf v1.3.2 // indirect
9394
github.com/golangci/asciicheck v0.5.0 // indirect
9495
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
9596
github.com/golangci/go-printf-func-name v0.1.1 // indirect
9697
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
97-
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
98+
github.com/golangci/golangci-lint/v2 v2.8.0 // indirect
99+
github.com/golangci/golines v0.14.0 // indirect
98100
github.com/golangci/misspell v0.7.0 // indirect
99101
github.com/golangci/plugin-module-register v0.1.2 // indirect
100102
github.com/golangci/revgrep v0.8.0 // indirect
@@ -110,7 +112,7 @@ require (
110112
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
111113
github.com/hashicorp/go-version v1.8.0 // indirect
112114
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
113-
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
115+
github.com/hashicorp/hcl v1.0.0 // indirect
114116
github.com/hexops/gotextdiff v1.0.3 // indirect
115117
github.com/inconshreveable/mousetrap v1.1.0 // indirect
116118
github.com/jgautheron/goconst v1.8.2 // indirect
@@ -126,14 +128,15 @@ require (
126128
github.com/kunwardeep/paralleltest v1.0.15 // indirect
127129
github.com/lasiar/canonicalheader v1.1.2 // indirect
128130
github.com/ldez/exptostd v0.4.5 // indirect
129-
github.com/ldez/gomoddirectives v0.7.1 // indirect
131+
github.com/ldez/gomoddirectives v0.8.0 // indirect
130132
github.com/ldez/grignotin v0.10.1 // indirect
133+
github.com/ldez/structtags v0.6.1 // indirect
131134
github.com/ldez/tagliatelle v0.7.2 // indirect
132135
github.com/ldez/usetesting v0.5.0 // indirect
133136
github.com/leonklingele/grouper v1.1.2 // indirect
134137
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
135138
github.com/macabu/inamedparam v0.2.0 // indirect
136-
github.com/magiconair/properties v1.8.7 // indirect
139+
github.com/magiconair/properties v1.8.6 // indirect
137140
github.com/mailru/easyjson v0.7.7 // indirect
138141
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
139142
github.com/manuelarte/funcorder v0.5.0 // indirect
@@ -155,13 +158,13 @@ require (
155158
github.com/nishanths/exhaustive v0.12.0 // indirect
156159
github.com/nishanths/predeclared v0.2.2 // indirect
157160
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
161+
github.com/pelletier/go-toml v1.9.5 // indirect
158162
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
159-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
160-
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
161-
github.com/prometheus/client_golang v1.22.0 // indirect
162-
github.com/prometheus/client_model v0.6.1 // indirect
163-
github.com/prometheus/common v0.62.0 // indirect
164-
github.com/prometheus/procfs v0.15.1 // indirect
163+
github.com/pmezard/go-difflib v1.0.0 // indirect
164+
github.com/prometheus/client_golang v1.23.2 // indirect
165+
github.com/prometheus/client_model v0.6.2 // indirect
166+
github.com/prometheus/common v0.66.1 // indirect
167+
github.com/prometheus/procfs v0.16.1 // indirect
165168
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
166169
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
167170
github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -172,28 +175,26 @@ require (
172175
github.com/rogpeppe/go-internal v1.14.1 // indirect
173176
github.com/ryancurrah/gomodguard v1.4.1 // indirect
174177
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
175-
github.com/sagikazarmark/locafero v0.4.0 // indirect
176-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
177178
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
178179
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
179180
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
180181
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
181-
github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 // indirect
182+
github.com/securego/gosec/v2 v2.22.11 // indirect
182183
github.com/sirupsen/logrus v1.9.3 // indirect
183184
github.com/sivchari/containedctx v1.0.3 // indirect
184185
github.com/sonatard/noctx v0.4.0 // indirect
185-
github.com/sourcegraph/conc v0.3.0 // indirect
186186
github.com/sourcegraph/go-diff v0.7.0 // indirect
187187
github.com/spf13/afero v1.15.0 // indirect
188-
github.com/spf13/cast v1.7.0 // indirect
188+
github.com/spf13/cast v1.5.0 // indirect
189189
github.com/spf13/cobra v1.10.2 // indirect
190+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
190191
github.com/spf13/pflag v1.0.10 // indirect
191-
github.com/spf13/viper v1.19.0 // indirect
192+
github.com/spf13/viper v1.12.0 // indirect
192193
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
193194
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
194195
github.com/stretchr/objx v0.5.2 // indirect
195196
github.com/stretchr/testify v1.11.1 // indirect
196-
github.com/subosito/gotenv v1.6.0 // indirect
197+
github.com/subosito/gotenv v1.4.1 // indirect
197198
github.com/tetafro/godot v1.5.4 // indirect
198199
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
199200
github.com/timonwong/loggercheck v0.11.0 // indirect
@@ -214,35 +215,41 @@ require (
214215
go-simpler.org/sloglint v0.11.1 // indirect
215216
go.augendre.info/arangolint v0.3.1 // indirect
216217
go.augendre.info/fatcontext v0.9.0 // indirect
218+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
217219
go.uber.org/automaxprocs v1.6.0 // indirect
218220
go.uber.org/multierr v1.11.0 // indirect
219221
go.uber.org/zap v1.27.0 // indirect
220-
go.yaml.in/yaml/v2 v2.4.2 // indirect
222+
go.yaml.in/yaml/v2 v2.4.3 // indirect
221223
go.yaml.in/yaml/v3 v3.0.4 // indirect
222-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
223224
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
224-
golang.org/x/mod v0.31.0 // indirect
225-
golang.org/x/net v0.48.0 // indirect
225+
golang.org/x/mod v0.32.0 // indirect
226+
golang.org/x/net v0.49.0 // indirect
226227
golang.org/x/sync v0.19.0 // indirect
227-
golang.org/x/sys v0.39.0 // indirect
228-
golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
229-
golang.org/x/text v0.32.0 // indirect
230-
google.golang.org/protobuf v1.36.8 // indirect
228+
golang.org/x/sys v0.40.0 // indirect
229+
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
230+
golang.org/x/text v0.33.0 // indirect
231+
golang.org/x/tools v0.41.0 // indirect
232+
google.golang.org/genproto/googleapis/api v0.0.0-20260122232226-8e98ce8d340d // indirect
233+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
234+
google.golang.org/grpc v1.76.0 // indirect
235+
google.golang.org/protobuf v1.36.11 // indirect
231236
gopkg.in/inf.v0 v0.9.1 // indirect
232237
gopkg.in/ini.v1 v1.67.0 // indirect
233238
gopkg.in/yaml.v2 v2.4.0 // indirect
234239
gopkg.in/yaml.v3 v3.0.1 // indirect
235-
k8s.io/api v0.34.0 // indirect
236-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
237-
k8s.io/apimachinery v0.34.0 // indirect
238-
k8s.io/code-generator v0.34.0 // indirect
239-
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
240+
honnef.co/go/tools v0.6.1 // indirect
241+
k8s.io/api v0.35.0 // indirect
242+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
243+
k8s.io/apimachinery v0.35.0 // indirect
244+
k8s.io/code-generator v0.35.0 // indirect
245+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
240246
k8s.io/klog/v2 v2.130.1 // indirect
241-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
242-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
247+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
248+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
243249
mvdan.cc/gofumpt v0.9.2 // indirect
244250
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
245-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
251+
sigs.k8s.io/controller-tools v0.20.0 // indirect
252+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
246253
sigs.k8s.io/randfill v1.0.0 // indirect
247254
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
248255
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)