Skip to content

Commit e72e139

Browse files
committed
chore: Upgrade golangci-lint to 2.6.2
1 parent 20f77ec commit e72e139

Some content is hidden

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

54 files changed

+397
-198
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Go 1.x
4141
uses: actions/setup-go@v6
4242
with:
43-
go-version: ^1.18
43+
go-version: '^1.25'
4444
id: go
4545

4646
- name: Checkout repository

.github/workflows/darwin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go 1.x
1414
uses: actions/setup-go@v6
1515
with:
16-
go-version: ^1.16
16+
go-version: '^1.25'
1717
id: go
1818

1919
- name: Check out code into the Go module directory

.github/workflows/linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go 1.x
1414
uses: actions/setup-go@v6
1515
with:
16-
go-version: ^1.16
16+
go-version: '^1.25'
1717
id: go
1818

1919
- name: Check out code into the Go module directory

.github/workflows/static.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ jobs:
1010
- name: Set up Go 1.x
1111
uses: actions/setup-go@v6
1212
with:
13-
go-version: ^1.19
13+
go-version: '^1.25'
1414
- uses: actions/checkout@master
1515
- name: Run linter
16-
uses: golangci/golangci-lint-action@v6
16+
uses: golangci/golangci-lint-action@v8
1717
with:
18-
version: v1.64
19-
args: -E=gofmt,unused,ineffassign,revive,misspell,copyloopvar,asciicheck,bodyclose,contextcheck,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
18+
version: v2.6.2
19+
args: --timeout=30m0s
20+
skip-cache: true
21+
skip-save-cache: true

.github/workflows/trivy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v6
1414
with:
15-
go-version: 1.24.9
15+
go-version: '^1.25'
1616
id: go
1717

1818
- name: Checkout code
1919
uses: actions/checkout@v6
20-
20+
2121
- name: Build an image from Dockerfile
2222
run: |
2323
export PUBLISH=true
2424
export REGISTRY=test
2525
export IMAGE_VERSION=latest
2626
export DOCKER_CLI_EXPERIMENTAL=enabled
2727
make container
28-
28+
2929
- name: Run Trivy vulnerability scanner
3030
uses: aquasecurity/trivy-action@master
3131
env:

.github/workflows/ubuntu-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v6
1818
with:
19-
go-version: ^1.16
19+
go-version: '^1.25'
2020
id: go
2121

2222
- name: Check out code into the Go module directory

.github/workflows/windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ jobs:
77
build:
88
strategy:
99
matrix:
10-
go-versions: [1.16.x]
10+
go-versions: [1.25.x]
1111
platform: [windows-latest]
1212
runs-on: ${{ matrix.platform }}
1313
steps:
1414
- name: Set up Go 1.x
1515
uses: actions/setup-go@v6
1616
with:
17-
go-version: ^1.16
17+
go-version: '^1.25'
1818
id: go
1919
- name: Checkout code
2020
uses: actions/checkout@v6

.golangci.yml

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
1-
linters-settings:
2-
depguard:
3-
rules:
4-
main:
5-
files:
6-
- $all
7-
- "!$test"
8-
allow:
9-
- $gostd
10-
- k8s.io
11-
- sigs.k8s.io
12-
- github.com
1+
version: "2"
2+
3+
linters:
4+
settings:
5+
depguard:
6+
rules:
7+
main:
8+
files:
9+
- $all
10+
- '!$test'
11+
allow:
12+
- $gostd
13+
- k8s.io
14+
- sigs.k8s.io
15+
- github.com
16+
exclusions:
17+
generated: lax
18+
presets:
19+
- comments
20+
- common-false-positives
21+
- legacy
22+
- std-error-handling
23+
paths:
24+
- third_party$
25+
- builtin$
26+
- examples$
27+
- test/utils/azure/azure_helpers.go
28+
- vendor$
29+
formatters:
30+
enable:
31+
- gofmt
32+
- goimports
33+
- gofumpt
34+
exclusions:
35+
generated: lax
36+
paths:
37+
- third_party$
38+
- builtin$
39+
- examples$
40+
- vendor$

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes-csi/csi-driver-smb
22

3-
go 1.24.0
3+
go 1.25
44

55
godebug winsymlink=0
66

@@ -21,12 +21,12 @@ require (
2121
go.uber.org/goleak v1.3.0
2222
golang.org/x/net v0.47.0
2323
google.golang.org/grpc v1.65.0
24-
k8s.io/api v0.31.12
25-
k8s.io/apimachinery v0.31.12
26-
k8s.io/client-go v0.31.12
27-
k8s.io/component-base v0.31.12
24+
k8s.io/api v0.31.14
25+
k8s.io/apimachinery v0.31.14
26+
k8s.io/client-go v0.31.14
27+
k8s.io/component-base v0.31.14
2828
k8s.io/klog/v2 v2.130.1
29-
k8s.io/kubernetes v1.31.12
29+
k8s.io/kubernetes v1.31.14
3030
k8s.io/mount-utils v0.32.0
3131
k8s.io/pod-security-admission v0.31.12
3232
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -417,20 +417,20 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
417417
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
418418
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
419419
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
420-
k8s.io/api v0.31.12 h1:yysm83xHIoKAwfm2w0dT6Yz7vfWzl841AEMI7Y8wDa8=
421-
k8s.io/api v0.31.12/go.mod h1:f/srhhI7aDs9K4s0W1GX4/zb+cIf5uWrBjGyoO/XgJc=
420+
k8s.io/api v0.31.14 h1:xYn/S/WFJsksI7dk/5uBRd3Umm/D8W5g7sRnd4csotA=
421+
k8s.io/api v0.31.14/go.mod h1:K8fvRey4z73RAuxBZCma7WtY8WFvkViYhfFLCMT4xgA=
422422
k8s.io/apiextensions-apiserver v0.31.12 h1:d32I3VReAly5Qoc9ZXhO4/iObYmm7Jk6VvAeRAbg/MA=
423423
k8s.io/apiextensions-apiserver v0.31.12/go.mod h1:KcBI/Z/WQmbffBwfqQmqHhALhvun5JNJJh8Y29CJwUo=
424-
k8s.io/apimachinery v0.31.12 h1:y34W8rNKc+jDxUvEXarjahqM6vOV5iqgZPuRqRuyEh8=
425-
k8s.io/apimachinery v0.31.12/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
424+
k8s.io/apimachinery v0.31.14 h1:/eMIwjv+GFm6A/sSGlB1NupBU6wTDPhEWsju0Fj69kY=
425+
k8s.io/apimachinery v0.31.14/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
426426
k8s.io/apiserver v0.31.12 h1:W5hKS78HC/llxTLBICR/xXScPkc5sPkDA66pyAin+mQ=
427427
k8s.io/apiserver v0.31.12/go.mod h1:f0EWMQvAmOfNBrYYVesqnQFrfMyDYlxVUOLm/RNDbP8=
428-
k8s.io/client-go v0.31.12 h1:JJhouOoU1bKdPWplkZ2CpYA74+lxj3Zsn15aoGLX6Hk=
429-
k8s.io/client-go v0.31.12/go.mod h1:kjQ5WSec9ShP3T1auTDFW4bTqgmJdBuZPsjq5FqeuYE=
428+
k8s.io/client-go v0.31.14 h1:d4/G0xfksNIbMWH7ghjzOwC5bTAwQ20gABTjZw7fLlQ=
429+
k8s.io/client-go v0.31.14/go.mod h1:0uRpRB7r5QwtsbxEngZPkbcIVoNdAQAPIcopgiXjhQc=
430430
k8s.io/cloud-provider v0.31.12 h1:la9A7dGy0VpcnI5nNZ7/RhU4/0ZoAVx6QM6T+Lze96s=
431431
k8s.io/cloud-provider v0.31.12/go.mod h1:VKHFFjRqXQNryOxbW+xE/0tL8qm8ejxaQ0t3TRA2AMc=
432-
k8s.io/component-base v0.31.12 h1:Z7SYHg782bY1NLGezTJYRZGPeywWVtFpE35iOEam//4=
433-
k8s.io/component-base v0.31.12/go.mod h1:r6wrhZ7BrjAUhGZttUT6MNJdn0McPWF5RPz/xcQY3xI=
432+
k8s.io/component-base v0.31.14 h1:VNjBuEMmvlwL4twRlMmlaVmsodIRaNivXcZoAx1/x7Q=
433+
k8s.io/component-base v0.31.14/go.mod h1:9ogYcJBUdB4VQ/OMgInYVRScC9bguXxSEEZPsInY+uM=
434434
k8s.io/component-helpers v0.31.12 h1:Mb9/Ijz0euQQ2v2IEgtKkvWBbDeMTq2fqHs1OoXPxGM=
435435
k8s.io/component-helpers v0.31.12/go.mod h1:62Zm0UNTFymcAUItaHCL+g9Qbco1WcSuiUvVSKEQtvk=
436436
k8s.io/controller-manager v0.31.12 h1:wrRs4CWP2ZtL5JnyW9QaTgD9DB1YQI7Sr68ifKF9n+M=
@@ -447,8 +447,8 @@ k8s.io/kubectl v0.31.12 h1:+f0KlQcVYX/7J7ii0AGRwCZYVx55u4dOj3Irrh17Daw=
447447
k8s.io/kubectl v0.31.12/go.mod h1:BbqRvKt1mdJLdk+0Qovx38/d2MCLwTA31I8IN+Fql1s=
448448
k8s.io/kubelet v0.31.12 h1:iSaYgKgLig52YOqsu+3wIXq/p++sawwQM59D7t0gIgQ=
449449
k8s.io/kubelet v0.31.12/go.mod h1:lOqTjK7k1wmGMPanLMykpEYYyfjNgCu9EDG6kYqu2Jc=
450-
k8s.io/kubernetes v1.31.12 h1:dPgK1slI7p/D3I2J1NA6UfBeMMHcjB91rHdXMpx8fkU=
451-
k8s.io/kubernetes v1.31.12/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
450+
k8s.io/kubernetes v1.31.14 h1:UtjLfqvXLuSVDdJ4+NpQCIfFkKkLnAAVmxAEMsnkhjk=
451+
k8s.io/kubernetes v1.31.14/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
452452
k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4=
453453
k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
454454
k8s.io/pod-security-admission v0.31.12 h1:lL+0Mn2MqTdFqgRPo0u+nO9/GhaBB/MrOxJLILw3oO4=

0 commit comments

Comments
 (0)