Skip to content

Commit a893392

Browse files
ChandrikaHarishChandrikaHarish
authored
Bump github.com/golangci/golangci-lint/v2 from 2.7.2 to 2.8.0 (kubernetes-sigs#2640)
1 parent 033a048 commit a893392

File tree

7 files changed

+111
-104
lines changed

7 files changed

+111
-104
lines changed

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ linters:
162162
- revive
163163
path: .*(api|types)\/.*\/.*conversion.*\.go$
164164
text: exported (method|function|type|const) (.+) should have comment or be unexported
165+
- linters:
166+
- revive
167+
path: \.go$
168+
text: 'var-naming: avoid package names that conflict with Go standard library package names'
165169
- linters:
166170
- revive
167171
path: .*(api|types)\/.*\/.*conversion.*\.go$

‎cloud/scope/powervs/powervs_cluster_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8125,7 +8125,7 @@ func TestValidateVPCSecurityGroupRule(t *testing.T) {
81258125
ID: ptr.To("ruleID"),
81268126
}
81278127

8128-
var vpcSecurityGroupRules []vpcv1.SecurityGroupRuleIntf
8128+
vpcSecurityGroupRules := make([]vpcv1.SecurityGroupRuleIntf, 0, 1)
81298129
vpcSecurityGroupRules = append(vpcSecurityGroupRules, &vpcSecurityGroupRule)
81308130
vpcSecurityGroup := infrav1.VPCSecurityGroup{
81318131
ID: ptr.To("securityGroupID"),
@@ -8174,7 +8174,7 @@ func TestValidateVPCSecurityGroupRule(t *testing.T) {
81748174
ID: ptr.To("ruleID"),
81758175
}
81768176

8177-
var vpcSecurityGroupRules []vpcv1.SecurityGroupRuleIntf
8177+
vpcSecurityGroupRules := make([]vpcv1.SecurityGroupRuleIntf, 0, 1)
81788178
vpcSecurityGroupRules = append(vpcSecurityGroupRules, &vpcSecurityGroupRule)
81798179
vpcSecurityGroup := infrav1.VPCSecurityGroup{
81808180
ID: ptr.To("securityGroupID"),

‎cloud/scope/vpc/cluster_v2.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@ func (s *ClusterScopeV2) buildLoadBalancerBackendPool(pool infrav1.VPCLoadBalanc
21282128

21292129
// getDefaultBalancerBackendPools returns a list of default Load Balancer Backend Pools for a Load Balancer.
21302130
func (s *ClusterScopeV2) getDefaultLoadBalancerBackendPools() []vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext {
2131-
defaultPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0)
2131+
defaultPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0, 1)
21322132

21332133
// For now, only one default pool is expected.
21342134
defaultPool := infrav1.VPCLoadBalancerBackendPoolSpec{
@@ -2171,7 +2171,7 @@ func (s *ClusterScopeV2) buildLoadBalancerListener(additionalListener infrav1.Ad
21712171

21722172
// getDefaultLoadBalancerListeners returns a list of default Load Balancer Listeners for a Load Balancer.
21732173
func (s *ClusterScopeV2) getDefaultLoadBalancerListeners(defaultBackendPool bool) []vpcv1.LoadBalancerListenerPrototypeLoadBalancerContext {
2174-
defaultListeners := make([]vpcv1.LoadBalancerListenerPrototypeLoadBalancerContext, 0)
2174+
defaultListeners := make([]vpcv1.LoadBalancerListenerPrototypeLoadBalancerContext, 0, 1)
21752175

21762176
// For now only one default listener is expected.
21772177
defaultListener := infrav1.AdditionalListenerSpec{

‎cloud/scope/vpc/machine.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ func (m *MachineScope) IsReady() bool {
10471047

10481048
// SetAddresses sets the Machine's addresses.
10491049
func (m *MachineScope) SetAddresses(instance *vpcv1.Instance) {
1050-
addresses := make([]corev1.NodeAddress, 0)
1050+
addresses := make([]corev1.NodeAddress, 0, 1)
10511051
addresses = append(addresses, corev1.NodeAddress{
10521052
Type: corev1.NodeInternalDNS,
10531053
Address: *instance.Name,

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, serviceEndpoint []e
302302
&powervsinfrav1.IBMPowerVSImage{}: {UseCache: true, UseStatusForStorageVersionMigration: true},
303303
}
304304

305-
crdMigratorSkipPhases := []crdmigrator.Phase{}
305+
crdMigratorSkipPhases := make([]crdmigrator.Phase, 0, 1)
306306
for _, p := range skipCRDMigrationPhases {
307307
crdMigratorSkipPhases = append(crdMigratorSkipPhases, crdmigrator.Phase(p))
308308
}

‎hack/tools/go.mod‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.12.3
66

77
require (
88
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
9-
github.com/golangci/golangci-lint/v2 v2.7.2
9+
github.com/golangci/golangci-lint/v2 v2.8.0
1010
github.com/itchyny/gojq v0.12.18
1111
github.com/joelanford/go-apidiff v0.8.3
1212
github.com/onsi/ginkgo/v2 v2.27.2
@@ -15,7 +15,7 @@ require (
1515
gotest.tools/gotestsum v1.13.0
1616
k8s.io/code-generator v0.34.3
1717
k8s.io/release v0.16.9
18-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20260217104304-1a1852c74072
18+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20251209103530-b52de697d29f
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387
2020
sigs.k8s.io/controller-tools v0.19.0
2121
sigs.k8s.io/kustomize/kustomize/v5 v5.8.1
@@ -33,6 +33,7 @@ require (
3333
cloud.google.com/go/monitoring v1.24.2 // indirect
3434
cloud.google.com/go/storage v1.57.2 // indirect
3535
codeberg.org/chavacava/garif v0.2.0 // indirect
36+
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
3637
cuelabs.dev/go/oci/ociregistry v0.0.0-20240314152124-224736b49f2e // indirect
3738
cuelang.org/go v0.8.1 // indirect
3839
dario.cat/mergo v1.0.2 // indirect
@@ -58,25 +59,25 @@ require (
5859
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5960
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6061
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
61-
github.com/BurntSushi/toml v1.5.0 // indirect
62+
github.com/BurntSushi/toml v1.6.0 // indirect
6263
github.com/Djarvur/go-err113 v0.1.1 // indirect
6364
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
6465
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
6566
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
6667
github.com/MakeNowJust/heredoc/v2 v2.0.1 // indirect
6768
github.com/Masterminds/semver/v3 v3.4.0 // indirect
6869
github.com/Microsoft/go-winio v0.6.2 // indirect
69-
github.com/MirrexOne/unqueryvet v1.3.0 // indirect
70+
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
7071
github.com/OneOfOne/xxhash v1.2.8 // indirect
7172
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
7273
github.com/ProtonMail/go-crypto v1.2.0 // indirect
7374
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
7475
github.com/VividCortex/ewma v1.2.0 // indirect
7576
github.com/agnivade/levenshtein v1.2.0 // indirect
76-
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
77+
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
7778
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
7879
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
79-
github.com/alexkohler/prealloc v1.0.0 // indirect
80+
github.com/alexkohler/prealloc v1.0.2 // indirect
8081
github.com/alfatraining/structtag v1.0.0 // indirect
8182
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
8283
github.com/alibabacloud-go/cr-20160607 v1.0.1 // indirect
@@ -119,7 +120,7 @@ require (
119120
github.com/blang/semver/v4 v4.0.0 // indirect
120121
github.com/blizzy78/varnamelen v0.8.0 // indirect
121122
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
122-
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
123+
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
123124
github.com/breml/bidichk v0.3.3 // indirect
124125
github.com/breml/errchkjson v0.4.1 // indirect
125126
github.com/buildkite/agent/v3 v3.62.0 // indirect
@@ -133,7 +134,7 @@ require (
133134
github.com/charithe/durationcheck v0.0.11 // indirect
134135
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
135136
github.com/charmbracelet/lipgloss v1.1.0 // indirect
136-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
137+
github.com/charmbracelet/x/ansi v0.10.1 // indirect
137138
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
138139
github.com/charmbracelet/x/term v0.2.1 // indirect
139140
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
@@ -177,10 +178,10 @@ require (
177178
github.com/fsnotify/fsnotify v1.9.0 // indirect
178179
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
179180
github.com/fzipp/gocyclo v0.6.0 // indirect
180-
github.com/ghostiam/protogetter v0.3.17 // indirect
181+
github.com/ghostiam/protogetter v0.3.20 // indirect
181182
github.com/glebarez/go-sqlite v1.22.0 // indirect
182183
github.com/go-chi/chi v4.1.2+incompatible // indirect
183-
github.com/go-critic/go-critic v0.14.2 // indirect
184+
github.com/go-critic/go-critic v0.14.3 // indirect
184185
github.com/go-errors/errors v1.4.2 // indirect
185186
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
186187
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -211,13 +212,13 @@ require (
211212
github.com/go-toolsmith/astp v1.1.0 // indirect
212213
github.com/go-toolsmith/strparse v1.1.0 // indirect
213214
github.com/go-toolsmith/typep v1.1.0 // indirect
214-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
215+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
215216
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
216217
github.com/goark/errs v1.3.2 // indirect
217218
github.com/goark/go-cvss v1.6.6 // indirect
218219
github.com/gobuffalo/flect v1.0.3 // indirect
219220
github.com/gobwas/glob v0.2.3 // indirect
220-
github.com/godoc-lint/godoc-lint v0.10.2 // indirect
221+
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
221222
github.com/gofrs/flock v0.13.0 // indirect
222223
github.com/gogo/protobuf v1.3.2 // indirect
223224
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
@@ -227,8 +228,8 @@ require (
227228
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
228229
github.com/golangci/go-printf-func-name v0.1.1 // indirect
229230
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
230-
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
231-
github.com/golangci/misspell v0.7.0 // indirect
231+
github.com/golangci/golines v0.15.0 // indirect
232+
github.com/golangci/misspell v0.8.0 // indirect
232233
github.com/golangci/plugin-module-register v0.1.2 // indirect
233234
github.com/golangci/revgrep v0.8.0 // indirect
234235
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
@@ -284,8 +285,9 @@ require (
284285
github.com/kunwardeep/paralleltest v1.0.15 // indirect
285286
github.com/lasiar/canonicalheader v1.1.2 // indirect
286287
github.com/ldez/exptostd v0.4.5 // indirect
287-
github.com/ldez/gomoddirectives v0.7.1 // indirect
288+
github.com/ldez/gomoddirectives v0.8.0 // indirect
288289
github.com/ldez/grignotin v0.10.1 // indirect
290+
github.com/ldez/structtags v0.6.1 // indirect
289291
github.com/ldez/tagliatelle v0.7.2 // indirect
290292
github.com/ldez/usetesting v0.5.0 // indirect
291293
github.com/leonklingele/grouper v1.1.2 // indirect
@@ -301,7 +303,7 @@ require (
301303
github.com/mattn/go-colorable v0.1.14 // indirect
302304
github.com/mattn/go-isatty v0.0.20 // indirect
303305
github.com/mattn/go-runewidth v0.0.19 // indirect
304-
github.com/mgechev/revive v1.13.0 // indirect
306+
github.com/mgechev/revive v1.14.0 // indirect
305307
github.com/miekg/pkcs11 v1.1.1 // indirect
306308
github.com/mitchellh/go-homedir v1.1.0 // indirect
307309
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -319,7 +321,7 @@ require (
319321
github.com/nishanths/exhaustive v0.12.0 // indirect
320322
github.com/nishanths/predeclared v0.2.2 // indirect
321323
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
322-
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
324+
github.com/nunnatsa/ginkgolinter v0.22.0 // indirect
323325
github.com/oklog/ulid v1.3.1 // indirect
324326
github.com/oleiade/reflections v1.0.1 // indirect
325327
github.com/open-policy-agent/opa v0.70.0 // indirect
@@ -333,7 +335,6 @@ require (
333335
github.com/pkg/errors v0.9.1 // indirect
334336
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
335337
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
336-
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
337338
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
338339
github.com/prometheus/client_golang v1.22.0 // indirect
339340
github.com/prometheus/client_model v0.6.2 // indirect
@@ -360,7 +361,7 @@ require (
360361
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
361362
github.com/sassoftware/relic v7.2.1+incompatible // indirect
362363
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
363-
github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 // indirect
364+
github.com/securego/gosec/v2 v2.22.11 // indirect
364365
github.com/segmentio/ksuid v1.0.4 // indirect
365366
github.com/sergi/go-diff v1.4.0 // indirect
366367
github.com/shibumi/go-pathspec v1.3.0 // indirect
@@ -370,7 +371,7 @@ require (
370371
github.com/sigstore/rekor v1.3.6 // indirect
371372
github.com/sigstore/sigstore v1.8.3 // indirect
372373
github.com/sigstore/timestamp-authority v1.2.2 // indirect
373-
github.com/sirupsen/logrus v1.9.3 // indirect
374+
github.com/sirupsen/logrus v1.9.4 // indirect
374375
github.com/sivchari/containedctx v1.0.3 // indirect
375376
github.com/skeema/knownhosts v1.3.1 // indirect
376377
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
@@ -423,7 +424,7 @@ require (
423424
gitlab.com/bosi/decorder v0.4.2 // indirect
424425
go-simpler.org/musttag v0.14.0 // indirect
425426
go-simpler.org/sloglint v0.11.1 // indirect
426-
go.augendre.info/arangolint v0.3.1 // indirect
427+
go.augendre.info/arangolint v0.4.0 // indirect
427428
go.augendre.info/fatcontext v0.9.0 // indirect
428429
go.mongodb.org/mongo-driver v1.14.0 // indirect
429430
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
@@ -441,19 +442,19 @@ require (
441442
go.uber.org/zap v1.27.1 // indirect
442443
go.yaml.in/yaml/v2 v2.4.2 // indirect
443444
go.yaml.in/yaml/v3 v3.0.4 // indirect
444-
golang.org/x/crypto v0.45.0 // indirect
445-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
446-
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
447-
golang.org/x/mod v0.30.0 // indirect
448-
golang.org/x/net v0.47.0 // indirect
445+
golang.org/x/crypto v0.48.0 // indirect
446+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
447+
golang.org/x/exp/typeparams v0.0.0-20251125195548-87e1e737ad39 // indirect
448+
golang.org/x/mod v0.33.0 // indirect
449+
golang.org/x/net v0.50.0 // indirect
449450
golang.org/x/oauth2 v0.33.0 // indirect
450-
golang.org/x/sync v0.18.0 // indirect
451-
golang.org/x/sys v0.40.0 // indirect
452-
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
453-
golang.org/x/term v0.37.0 // indirect
454-
golang.org/x/text v0.31.0 // indirect
451+
golang.org/x/sync v0.19.0 // indirect
452+
golang.org/x/sys v0.41.0 // indirect
453+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
454+
golang.org/x/term v0.40.0 // indirect
455+
golang.org/x/text v0.34.0 // indirect
455456
golang.org/x/time v0.14.0 // indirect
456-
golang.org/x/tools v0.39.0 // indirect
457+
golang.org/x/tools v0.42.0 // indirect
457458
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
458459
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
459460
google.golang.org/api v0.256.0 // indirect

0 commit comments

Comments
 (0)