Skip to content

Commit 977d611

Browse files
committed
bump go, packages and linter
this commit bumps: * golang version to 1.23.4 * golangci-lint to v1.63.4 * packages to handle CVEs Signed-off-by: Sebastian Sch <[email protected]>
1 parent 1536406 commit 977d611

File tree

12 files changed

+120
-106
lines changed

12 files changed

+120
-106
lines changed

.github/workflows/build-test-lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: build
66
strategy:
77
matrix:
8-
go-version: [1.22.x]
8+
go-version: [1.23.x]
99
goarch: [amd64]
1010
os: [ubuntu-latest]
1111
runs-on: ${{ matrix.os }}
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up Go
3333
uses: actions/setup-go@v3
3434
with:
35-
go-version: 1.22.x
35+
go-version: 1.23.x
3636

3737
- name: Check out code into the Go module directory
3838
uses: actions/checkout@v3
@@ -51,7 +51,7 @@ jobs:
5151
- name: Set up Go
5252
uses: actions/setup-go@v3
5353
with:
54-
go-version: 1.22.x
54+
go-version: 1.23.x
5555

5656
- uses: actions/checkout@v3
5757

@@ -74,7 +74,7 @@ jobs:
7474
- name: Set up Go
7575
uses: actions/setup-go@v3
7676
with:
77-
go-version: 1.22.x
77+
go-version: 1.23.x
7878

7979
- name: checkout
8080
uses: actions/checkout@v3
@@ -113,7 +113,7 @@ jobs:
113113
- name: Set up Go
114114
uses: actions/setup-go@v3
115115
with:
116-
go-version: 1.22.x
116+
go-version: 1.23.x
117117

118118
# if this fails, run go mod tidy
119119
- name: Check if module files are consistent with code

.golangci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# Tested with golangci-lint ver. 1.37
22
run:
33
timeout: 3m
4-
skip-dirs:
5-
- .github/
6-
- deployments/
7-
- docs/
8-
- images/
94

105
linters-settings:
116
depguard:
@@ -74,7 +69,7 @@ linters:
7469
- dogsled
7570
- dupl
7671
- errcheck
77-
- exportloopref
72+
- copyloopvar
7873
- exhaustive
7974
- funlen
8075
#- gochecknoinits
@@ -83,7 +78,7 @@ linters:
8378
- gocyclo
8479
- gofmt
8580
- goimports
86-
- gomnd
81+
- mnd
8782
- goprintffuncname
8883
- gosec
8984
- gosimple
@@ -114,3 +109,8 @@ issues:
114109
- lll
115110
- stylecheck
116111
- goconst
112+
exclude-dirs:
113+
- .github/
114+
- deployments/
115+
- docs/
116+
- images/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ build: | $(BUILDDIR) ; $(info Building $(BINARY_NAME)...) @ ## Build SR-IOV Netw
5555
$(info Done!)
5656

5757
GOLANGCI_LINT = $(BINDIR)/golangci-lint
58-
GOLANGCI_LINT_VERSION ?= v1.55.2
58+
GOLANGCI_LINT_VERSION ?= v1.63.4
5959
$(GOLANGCI_LINT): | $(BINDIR) ; $(info installing golangci-lint...)
6060
$Q[ -f $(GOLANGCI_LINT) ] || { \
6161
set -e ;\

go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module github.com/k8snetworkplumbingwg/sriov-network-device-plugin
22

3-
go 1.22.4
3+
go 1.23.4
44

55
require (
66
github.com/Mellanox/rdmamap v1.1.0
77
github.com/container-orchestrated-devices/container-device-interface v0.5.4
8-
github.com/golang/glog v1.2.2
8+
github.com/golang/glog v1.2.3
99
github.com/jaypipes/ghw v0.13.0
1010
github.com/jaypipes/pcidb v1.0.1
1111
github.com/k8snetworkplumbingwg/govdpa v0.1.4
1212
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
1313
github.com/k8snetworkplumbingwg/sriovnet v1.2.1-0.20240128120937-3ca5e43034e6
1414
github.com/onsi/ginkgo v1.16.5
15-
github.com/onsi/gomega v1.34.2
15+
github.com/onsi/gomega v1.36.2
1616
github.com/pkg/errors v0.9.1
17-
github.com/stretchr/testify v1.9.0
17+
github.com/stretchr/testify v1.10.0
1818
github.com/vishvananda/netlink v1.3.0
19-
google.golang.org/grpc v1.67.1
20-
k8s.io/kubelet v0.31.1
19+
google.golang.org/grpc v1.69.2
20+
k8s.io/kubelet v0.32.0
2121
)
2222

2323
require (
@@ -30,9 +30,9 @@ require (
3030
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3131
github.com/go-logr/logr v1.4.2 // indirect
3232
github.com/go-ole/go-ole v1.3.0 // indirect
33-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
33+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3434
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/swag v0.22.4 // indirect
35+
github.com/go-openapi/swag v0.23.0 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
3737
github.com/golang/protobuf v1.5.4 // indirect
3838
github.com/google/gnostic-models v0.6.8 // indirect
@@ -57,26 +57,26 @@ require (
5757
github.com/vishvananda/netns v0.0.4 // indirect
5858
github.com/x448/float16 v0.8.4 // indirect
5959
golang.org/x/mod v0.20.0 // indirect
60-
golang.org/x/net v0.28.0 // indirect
61-
golang.org/x/oauth2 v0.22.0 // indirect
62-
golang.org/x/sys v0.25.0 // indirect
63-
golang.org/x/term v0.23.0 // indirect
64-
golang.org/x/text v0.17.0 // indirect
65-
golang.org/x/time v0.3.0 // indirect
66-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
67-
google.golang.org/protobuf v1.34.2 // indirect
60+
golang.org/x/net v0.33.0 // indirect
61+
golang.org/x/oauth2 v0.23.0 // indirect
62+
golang.org/x/sys v0.28.0 // indirect
63+
golang.org/x/term v0.27.0 // indirect
64+
golang.org/x/text v0.21.0 // indirect
65+
golang.org/x/time v0.7.0 // indirect
66+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
67+
google.golang.org/protobuf v1.36.1 // indirect
68+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6869
gopkg.in/inf.v0 v0.9.1 // indirect
6970
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
70-
gopkg.in/yaml.v2 v2.4.0 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
7272
howett.net/plist v1.0.1 // indirect
73-
k8s.io/api v0.31.1 // indirect
74-
k8s.io/apimachinery v0.31.1 // indirect
75-
k8s.io/client-go v0.31.1 // indirect
73+
k8s.io/api v0.32.0 // indirect
74+
k8s.io/apimachinery v0.32.0 // indirect
75+
k8s.io/client-go v0.32.0 // indirect
7676
k8s.io/klog/v2 v2.130.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
78-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
79-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
77+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
78+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
79+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
80+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
8181
sigs.k8s.io/yaml v1.4.0 // indirect
8282
)

0 commit comments

Comments
 (0)