Skip to content

Commit a336031

Browse files
committed
Reapply "Merge pull request #2944 from bowei/pr-update-go-125"
This reverts commit 0d31311.
1 parent 25efbaa commit a336031

File tree

2,712 files changed

+476499
-2185
lines changed

Some content is hidden

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

2,712 files changed

+476499
-2185
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ OS ?= linux
4747
ALL_ARCH := amd64
4848

4949
# Image to use for building.
50-
BUILD_IMAGE ?= golang:1.23.7
50+
BUILD_IMAGE ?= golang:1.25.0
5151
# Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION).
5252
CONTAINER_PREFIX ?= ingress-gce
5353

@@ -70,4 +70,4 @@ generate:
7070
hack/update-codegen.sh
7171
# run linters, ensure generated code, etc.
7272
verify:
73-
hack/verify-all.sh
73+
hack/verify-all.sh

build/test.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,9 @@ fi
5050
echo "PASS"
5151
echo
5252

53-
# Set gobin here, install dependencies after this
54-
cd "hack/tools"
55-
export GOBIN=$PWD/bin
56-
export PATH=$GOBIN:$PATH
57-
# Install golangci-lint
58-
echo "Installing golangci-lint"
59-
echo
60-
go install github.com/golangci/golangci-lint/cmd/golangci-lint > /dev/null
61-
cd "../.."
62-
6353
export GOLANGCI_LINT_CACHE=$PWD/.cache
6454
echo -n "Checking linters: "
65-
ERRS=$(golangci-lint run ${TARGETS} 2>&1 || true)
55+
ERRS=$(go tool golangci-lint run ${TARGETS} 2>&1 || true)
6656
if [ -n "${ERRS}" ]; then
6757
echo "FAIL"
6858
echo "${ERRS}"

go.mod

Lines changed: 169 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/ingress-gce
22

3-
go 1.23.7
3+
go 1.25.0
44

55
require (
66
github.com/GoogleCloudPlatform/gke-networking-api v0.2.1-0.20250318085121-e88f4ed9f50a
@@ -12,10 +12,10 @@ require (
1212
github.com/kr/pretty v0.3.1
1313
github.com/prometheus/client_golang v1.16.0
1414
github.com/prometheus/client_model v0.4.0
15-
github.com/spf13/cobra v1.7.0
16-
github.com/spf13/pflag v1.0.5
15+
github.com/spf13/cobra v1.9.1
16+
github.com/spf13/pflag v1.0.6
1717
github.com/stretchr/testify v1.10.0
18-
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
18+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
1919
golang.org/x/oauth2 v0.28.0
2020
google.golang.org/api v0.226.0
2121
istio.io/api v0.0.0-20190809125725-591cf32c1d0e
@@ -32,67 +32,231 @@ require (
3232
)
3333

3434
require (
35+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
36+
4d63.com/gochecknoglobals v0.2.2 // indirect
3537
cloud.google.com/go/auth v0.15.0 // indirect
3638
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
3739
cloud.google.com/go/compute/metadata v0.6.0 // indirect
40+
github.com/4meepo/tagalign v1.4.2 // indirect
41+
github.com/Abirdcfly/dupword v0.1.3 // indirect
42+
github.com/Antonboom/errname v1.0.0 // indirect
43+
github.com/Antonboom/nilnil v1.0.1 // indirect
44+
github.com/Antonboom/testifylint v1.5.2 // indirect
45+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
46+
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
47+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
48+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
49+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
50+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
51+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
52+
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
53+
github.com/alexkohler/prealloc v1.0.0 // indirect
54+
github.com/alingse/asasalint v0.0.11 // indirect
55+
github.com/alingse/nilnesserr v0.1.2 // indirect
56+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
57+
github.com/ashanbrown/makezero v1.2.0 // indirect
3858
github.com/beorn7/perks v1.0.1 // indirect
59+
github.com/bkielbasa/cyclop v1.2.3 // indirect
3960
github.com/blang/semver/v4 v4.0.0 // indirect
61+
github.com/blizzy78/varnamelen v0.8.0 // indirect
62+
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
63+
github.com/breml/bidichk v0.3.2 // indirect
64+
github.com/breml/errchkjson v0.4.0 // indirect
65+
github.com/butuzov/ireturn v0.3.1 // indirect
66+
github.com/butuzov/mirror v1.3.0 // indirect
67+
github.com/catenacyber/perfsprint v0.8.2 // indirect
68+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
4069
github.com/cespare/xxhash/v2 v2.3.0 // indirect
70+
github.com/charithe/durationcheck v0.0.10 // indirect
71+
github.com/chavacava/garif v0.1.0 // indirect
72+
github.com/ckaznocha/intrange v0.3.0 // indirect
73+
github.com/curioswitch/go-reassign v0.3.0 // indirect
74+
github.com/daixiang0/gci v0.13.5 // indirect
4175
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
76+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
4277
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
78+
github.com/ettle/strcase v0.2.0 // indirect
79+
github.com/fatih/color v1.18.0 // indirect
80+
github.com/fatih/structtag v1.2.0 // indirect
4381
github.com/felixge/httpsnoop v1.0.4 // indirect
82+
github.com/firefart/nonamedreturns v1.0.5 // indirect
83+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4484
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
85+
github.com/fzipp/gocyclo v0.6.0 // indirect
86+
github.com/ghostiam/protogetter v0.3.9 // indirect
87+
github.com/go-critic/go-critic v0.12.0 // indirect
4588
github.com/go-logr/stdr v1.2.2 // indirect
4689
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4790
github.com/go-openapi/jsonreference v0.20.2 // indirect
4891
github.com/go-openapi/swag v0.22.4 // indirect
92+
github.com/go-toolsmith/astcast v1.1.0 // indirect
93+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
94+
github.com/go-toolsmith/astequal v1.2.0 // indirect
95+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
96+
github.com/go-toolsmith/astp v1.1.0 // indirect
97+
github.com/go-toolsmith/strparse v1.1.0 // indirect
98+
github.com/go-toolsmith/typep v1.1.0 // indirect
99+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
100+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
101+
github.com/gobwas/glob v0.2.3 // indirect
102+
github.com/gofrs/flock v0.12.1 // indirect
49103
github.com/gogo/protobuf v1.3.2 // indirect
50104
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
105+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
106+
github.com/golangci/go-printf-func-name v0.1.0 // indirect
107+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
108+
github.com/golangci/golangci-lint v1.64.8 // indirect
109+
github.com/golangci/misspell v0.6.0 // indirect
110+
github.com/golangci/plugin-module-register v0.1.1 // indirect
111+
github.com/golangci/revgrep v0.8.0 // indirect
112+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
51113
github.com/google/gnostic-models v0.6.8 // indirect
52114
github.com/google/gofuzz v1.2.0 // indirect
53115
github.com/google/s2a-go v0.1.9 // indirect
54116
github.com/google/uuid v1.6.0 // indirect
55117
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
56118
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
119+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
120+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
121+
github.com/gostaticanalysis/comment v1.5.0 // indirect
122+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
123+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
124+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
125+
github.com/hashicorp/go-version v1.7.0 // indirect
126+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
127+
github.com/hashicorp/hcl v1.0.0 // indirect
128+
github.com/hexops/gotextdiff v1.0.3 // indirect
57129
github.com/imdario/mergo v0.3.7 // indirect
58130
github.com/inconshreveable/mousetrap v1.1.0 // indirect
131+
github.com/jgautheron/goconst v1.7.1 // indirect
132+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
133+
github.com/jjti/go-spancheck v0.6.4 // indirect
59134
github.com/josharian/intern v1.0.0 // indirect
60135
github.com/json-iterator/go v1.1.12 // indirect
136+
github.com/julz/importas v0.2.0 // indirect
137+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
138+
github.com/kisielk/errcheck v1.9.0 // indirect
139+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
61140
github.com/kr/text v0.2.0 // indirect
141+
github.com/kulti/thelper v0.6.3 // indirect
142+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
143+
github.com/lasiar/canonicalheader v1.1.2 // indirect
144+
github.com/ldez/exptostd v0.4.2 // indirect
145+
github.com/ldez/gomoddirectives v0.6.1 // indirect
146+
github.com/ldez/grignotin v0.9.0 // indirect
147+
github.com/ldez/tagliatelle v0.7.1 // indirect
148+
github.com/ldez/usetesting v0.4.2 // indirect
149+
github.com/leonklingele/grouper v1.1.2 // indirect
150+
github.com/macabu/inamedparam v0.1.3 // indirect
151+
github.com/magiconair/properties v1.8.6 // indirect
62152
github.com/mailru/easyjson v0.7.7 // indirect
153+
github.com/maratori/testableexamples v1.0.0 // indirect
154+
github.com/maratori/testpackage v1.1.1 // indirect
155+
github.com/matoous/godox v1.1.0 // indirect
156+
github.com/mattn/go-colorable v0.1.14 // indirect
157+
github.com/mattn/go-isatty v0.0.20 // indirect
158+
github.com/mattn/go-runewidth v0.0.16 // indirect
63159
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
160+
github.com/mgechev/revive v1.7.0 // indirect
161+
github.com/mitchellh/go-homedir v1.1.0 // indirect
162+
github.com/mitchellh/mapstructure v1.5.0 // indirect
64163
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
65164
github.com/modern-go/reflect2 v1.0.2 // indirect
165+
github.com/moricho/tparallel v0.3.2 // indirect
66166
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
167+
github.com/nakabonne/nestif v0.3.1 // indirect
168+
github.com/nishanths/exhaustive v0.12.0 // indirect
169+
github.com/nishanths/predeclared v0.2.2 // indirect
170+
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
171+
github.com/olekukonko/tablewriter v0.0.5 // indirect
172+
github.com/pelletier/go-toml v1.9.5 // indirect
173+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
67174
github.com/pkg/errors v0.9.1 // indirect
68175
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
176+
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
69177
github.com/prometheus/common v0.44.0 // indirect
70178
github.com/prometheus/procfs v0.10.1 // indirect
71-
github.com/rogpeppe/go-internal v1.13.1 // indirect
179+
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
180+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
181+
github.com/quasilyte/gogrep v0.5.0 // indirect
182+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
183+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
184+
github.com/raeperd/recvcheck v0.2.0 // indirect
185+
github.com/rivo/uniseg v0.4.7 // indirect
186+
github.com/rogpeppe/go-internal v1.14.1 // indirect
187+
github.com/ryancurrah/gomodguard v1.3.5 // indirect
188+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
189+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
190+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
191+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
192+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
193+
github.com/securego/gosec/v2 v2.22.2 // indirect
194+
github.com/sirupsen/logrus v1.9.3 // indirect
195+
github.com/sivchari/containedctx v1.0.3 // indirect
196+
github.com/sivchari/tenv v1.12.1 // indirect
197+
github.com/sonatard/noctx v0.1.0 // indirect
198+
github.com/sourcegraph/go-diff v0.7.0 // indirect
199+
github.com/spf13/afero v1.12.0 // indirect
200+
github.com/spf13/cast v1.5.0 // indirect
201+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
202+
github.com/spf13/viper v1.12.0 // indirect
203+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
204+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
205+
github.com/stretchr/objx v0.5.2 // indirect
206+
github.com/subosito/gotenv v1.4.1 // indirect
207+
github.com/tdakkota/asciicheck v0.4.1 // indirect
208+
github.com/tetafro/godot v1.5.0 // indirect
209+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
210+
github.com/timonwong/loggercheck v0.10.1 // indirect
211+
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
212+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
213+
github.com/ultraware/funlen v0.2.0 // indirect
214+
github.com/ultraware/whitespace v0.2.0 // indirect
215+
github.com/uudashr/gocognit v1.2.0 // indirect
216+
github.com/uudashr/iface v1.3.1 // indirect
72217
github.com/x448/float16 v0.8.4 // indirect
218+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
219+
github.com/yagipy/maintidx v1.0.0 // indirect
220+
github.com/yeya24/promlinter v0.3.0 // indirect
221+
github.com/ykadowak/zerologlint v0.1.5 // indirect
222+
gitlab.com/bosi/decorder v0.4.2 // indirect
223+
go-simpler.org/musttag v0.13.0 // indirect
224+
go-simpler.org/sloglint v0.9.0 // indirect
73225
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
74226
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
75227
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
76228
go.opentelemetry.io/otel v1.34.0 // indirect
77229
go.opentelemetry.io/otel/metric v1.34.0 // indirect
78230
go.opentelemetry.io/otel/trace v1.34.0 // indirect
231+
go.uber.org/automaxprocs v1.6.0 // indirect
232+
go.uber.org/multierr v1.11.0 // indirect
233+
go.uber.org/zap v1.26.0 // indirect
79234
golang.org/x/crypto v0.36.0 // indirect
235+
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
236+
golang.org/x/mod v0.24.0 // indirect
80237
golang.org/x/net v0.38.0 // indirect
81238
golang.org/x/sync v0.12.0 // indirect
82239
golang.org/x/sys v0.31.0 // indirect
83240
golang.org/x/term v0.30.0 // indirect
84241
golang.org/x/text v0.23.0 // indirect
85242
golang.org/x/time v0.11.0 // indirect
243+
golang.org/x/tools v0.31.0 // indirect
86244
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
87245
google.golang.org/grpc v1.71.0 // indirect
88246
google.golang.org/protobuf v1.36.5 // indirect
89247
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
90248
gopkg.in/gcfg.v1 v1.2.3 // indirect
91249
gopkg.in/inf.v0 v0.9.1 // indirect
250+
gopkg.in/ini.v1 v1.67.0 // indirect
92251
gopkg.in/warnings.v0 v0.1.2 // indirect
93252
gopkg.in/yaml.v2 v2.4.0 // indirect
94253
gopkg.in/yaml.v3 v3.0.1 // indirect
254+
honnef.co/go/tools v0.6.1 // indirect
255+
mvdan.cc/gofumpt v0.7.0 // indirect
256+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
95257
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
96258
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
97259
sigs.k8s.io/yaml v1.4.0 // indirect
98260
)
261+
262+
tool github.com/golangci/golangci-lint/cmd/golangci-lint

0 commit comments

Comments
 (0)