Skip to content

Commit e939de9

Browse files
committed
bump go ver to 1.23
- bump go version - bump linter version Signed-off-by: adrianc <adrianc@nvidia.com>
1 parent e409566 commit e939de9

File tree

7 files changed

+29
-33
lines changed

7 files changed

+29
-33
lines changed

.github/workflows/test.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515

16-
- name: Set up Go 1.22
16+
- name: Set up Go 1.23
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.22.x
19+
go-version: 1.23.x
2020

2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v2
@@ -32,10 +32,10 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434

35-
- name: Set up Go 1.22
35+
- name: Set up Go 1.23
3636
uses: actions/setup-go@v2
3737
with:
38-
go-version: 1.22.x
38+
go-version: 1.23.x
3939

4040
- name: Check out code into the Go module directory
4141
uses: actions/checkout@v2
@@ -66,10 +66,10 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868

69-
- name: Set up Go 1.22
69+
- name: Set up Go 1.23
7070
uses: actions/setup-go@v2
7171
with:
72-
go-version: 1.22.x
72+
go-version: 1.23.x
7373

7474
- name: Check out code into the Go module directory
7575
uses: actions/checkout@v2
@@ -91,18 +91,15 @@ jobs:
9191
name: Golangci-lint
9292
runs-on: ubuntu-latest
9393
steps:
94-
- name: Set up Go 1.22
94+
- name: Set up Go 1.23
9595
uses: actions/setup-go@v2
9696
with:
97-
go-version: 1.22.x
97+
go-version: 1.23.x
9898
- name: Check out code into the Go module directory
9999
uses: actions/checkout@v2
100-
- name: golangci-lint
101-
uses: golangci/golangci-lint-action@v3
102-
with:
103-
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
104-
version: v1.55.2
105-
100+
- name: run lint checks
101+
run: make lint
102+
106103
shellcheck:
107104
name: Shellcheck
108105
runs-on: ubuntu-latest
@@ -118,10 +115,10 @@ jobs:
118115
runs-on: ubuntu-latest
119116
steps:
120117

121-
- name: Set up Go 1.22
118+
- name: Set up Go 1.23
122119
uses: actions/setup-go@v2
123120
with:
124-
go-version: 1.22.x
121+
go-version: 1.23.x
125122

126123
- name: Check out code into the Go module directory
127124
uses: actions/checkout@v2
@@ -161,10 +158,10 @@ jobs:
161158
- name: Check out code into the Go module directory
162159
uses: actions/checkout@v2
163160

164-
- name: Set up Go 1.22
161+
- name: Set up Go 1.23
165162
uses: actions/setup-go@v3
166163
with:
167-
go-version: 1.22.x
164+
go-version: 1.23.x
168165

169166
- name: run test
170167
run: make test-e2e-conformance-virtual-k8s-cluster-ci
@@ -198,7 +195,7 @@ jobs:
198195
- name: Set up Go 1.22
199196
uses: actions/setup-go@v3
200197
with:
201-
go-version: 1.22.x
198+
go-version: 1.23.x
202199

203200
- name: run test
204201
run: make test-e2e-conformance-virtual-ocp-cluster-ci

.golangci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Tested with golangci-lint ver. 1.37
22
run:
33
timeout: 10m
4-
skip-dirs:
5-
- vendor/
6-
- .github/
7-
- deployment/
8-
- doc/
9-
- bindata/
10-
- pkg/client
114
linters-settings:
125
depguard:
136
rules:
@@ -74,11 +67,11 @@ linters:
7467
disable-all: true
7568
enable:
7669
- bodyclose
70+
- copyloopvar
7771
- depguard
7872
- dogsled
7973
# TODO fix issues- dupl
8074
# TODO fix issues- errcheck
81-
- exportloopref
8275
- exhaustive
8376
# TODO fix issues- funlen
8477
#- gochecknoinits
@@ -107,6 +100,13 @@ linters:
107100
- whitespace
108101

109102
issues:
103+
exclude-dirs:
104+
- vendor/
105+
- .github/
106+
- deployment/
107+
- doc/
108+
- bindata/
109+
- pkg/client
110110
# Excluding configuration per-path, per-linter, per-text and per-source
111111
exclude-rules:
112112
- path: _test\.go

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 AS builder
1+
FROM golang:1.23 AS builder
22
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
33
COPY . .
44
RUN make _build-manager BIN_PATH=build/_output/cmd

Dockerfile.sriov-network-config-daemon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 AS builder
1+
FROM golang:1.23 AS builder
22
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
33
COPY . .
44
RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd

Dockerfile.webhook

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 AS builder
1+
FROM golang:1.23 AS builder
22
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
33
COPY . .
44
RUN make _build-webhook BIN_PATH=build/_output/cmd

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ GOLANGCI_LINT = $(BIN_DIR)/golangci-lint
5353
# golangci-lint version should be updated periodically
5454
# we keep it fixed to avoid it from unexpectedly failing on the project
5555
# in case of a version bump
56-
GOLANGCI_LINT_VER = v1.55.2
57-
56+
GOLANGCI_LINT_VER = v1.64.7
5857

5958
.PHONY: all build clean gendeepcopy test test-e2e test-e2e-k8s run image fmt sync-manifests test-e2e-conformance manifests update-codegen
6059

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/k8snetworkplumbingwg/sriov-network-operator
22

3-
go 1.22.4
3+
go 1.23
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.2

0 commit comments

Comments
 (0)