Merge pull request #1814 from mythi/PR-2024-020

tkatila · web-flow · commit ff200f9f95be · 2024-08-28T13:26:24.000+03:00
build: use Go 1.23.0
diff --git a/.github/workflows/lib-validate.yaml b/.github/workflows/lib-validate.yaml
@@ -42,7 +42,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6
         with:
-          version: v1.57.2
+          version: v1.60.3
           args: -v --timeout 5m
   build:
     name: Build and check device plugins
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,12 +12,12 @@ linters:
     - bodyclose
     - dogsled
     - errcheck
-    - exportloopref
+    - copyloopvar
     - gocognit
     - goconst
     - gocyclo
     - godot
-    - goerr113
+    - err113
     - gofmt
     - goimports
     - gomodguard
@@ -62,6 +62,9 @@ linters-settings:
 
 issues:
   exclude-rules:
+    - linters:
+        - gosec
+      text: "G115"
     - path: _test\.go
       linters:
         - gocognit
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ EXTRA_BUILD_ARGS ?= ""
 
 CERT_MANAGER_VERSION ?= v1.15.2
 CONTROLLER_GEN_VERSION ?= v0.16.1
-GOLANGCI_LINT_VERSION ?= v1.57.2
+GOLANGCI_LINT_VERSION ?= v1.60.3
 KIND_VERSION ?= v0.23.0
 GOLICENSES_VERSION ?= v1.6.0
 # Default bundle image tag
@@ -176,7 +176,7 @@ e2e-spr:
 
 pre-pull:
 ifeq ($(TAG),devel)
-	@$(BUILDER) pull golang:1.22-bookworm
+	@$(BUILDER) pull golang:1.23-bookworm
 	@$(BUILDER) pull debian:unstable-slim
 	@$(BUILDER) pull ubuntu:22.04
 endif
diff --git a/build/docker/intel-deviceplugin-operator.Dockerfile b/build/docker/intel-deviceplugin-operator.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-dlb-initcontainer.Dockerfile b/build/docker/intel-dlb-initcontainer.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-dlb-plugin.Dockerfile b/build/docker/intel-dlb-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-dsa-plugin.Dockerfile b/build/docker/intel-dsa-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-fpga-plugin.Dockerfile b/build/docker/intel-fpga-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-gpu-fakedev.Dockerfile b/build/docker/intel-gpu-fakedev.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-gpu-initcontainer.Dockerfile b/build/docker/intel-gpu-initcontainer.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-iaa-plugin.Dockerfile b/build/docker/intel-iaa-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-qat-initcontainer.Dockerfile b/build/docker/intel-qat-initcontainer.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-qat-plugin-kerneldrv.Dockerfile b/build/docker/intel-qat-plugin-kerneldrv.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-qat-plugin.Dockerfile b/build/docker/intel-qat-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-sgx-admissionwebhook.Dockerfile b/build/docker/intel-sgx-admissionwebhook.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-sgx-initcontainer.Dockerfile b/build/docker/intel-sgx-initcontainer.Dockerfile
@@ -33,7 +33,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-sgx-plugin.Dockerfile b/build/docker/intel-sgx-plugin.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-xpumanager-sidecar.Dockerfile b/build/docker/intel-xpumanager-sidecar.Dockerfile
@@ -34,7 +34,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
 FROM ${GOLANG_BASE} as builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/lib/golang_base.docker b/build/docker/lib/golang_base.docker
@@ -5,5 +5,5 @@
 ##
 ## This is used on release branches before tagging a stable version.
 ## The main branch defaults to using the latest Golang base image.
-ARG GOLANG_BASE=golang:1.22-bookworm
+ARG GOLANG_BASE=golang:1.23-bookworm
 ###
diff --git a/cmd/gpu_plugin/gpu_plugin_test.go b/cmd/gpu_plugin/gpu_plugin_test.go
@@ -589,7 +589,7 @@ func createBypathTestFiles(t *testing.T, card, root, linkFile string, bypathFile
 			t.Fatal("Couldn't create test drm dir", err)
 		}
 
-		if err := os.WriteFile(devPath, []byte{0}, os.ModePerm); err != nil {
+		if err := os.WriteFile(devPath, []byte{0}, 0o600); err != nil {
 			t.Fatal("Couldn't create card file", err)
 		}
 
@@ -604,7 +604,7 @@ func createBypathTestFiles(t *testing.T, card, root, linkFile string, bypathFile
 		}
 
 		for _, f := range bypathFiles {
-			if err := os.WriteFile(path.Join(byPath, f), []byte{1}, os.ModePerm); err != nil {
+			if err := os.WriteFile(path.Join(byPath, f), []byte{1}, 0o600); err != nil {
 				t.Fatal("WriteFile failed:", path.Join(byPath, f))
 			}
 		}
diff --git a/cmd/internal/labeler/labeler_test.go b/cmd/internal/labeler/labeler_test.go
@@ -638,7 +638,6 @@ func TestLabeling(t *testing.T) {
 			t.Fatalf("can't create temporary subroot directory: %+v", err)
 		}
 
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			err := os.MkdirAll(path.Join(subroot, "0"), 0750)
 			if err != nil {
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/intel/intel-device-plugins-for-kubernetes
 
-go 1.22.0
+go 1.23.0
 
 require (
 	github.com/fsnotify/fsnotify v1.7.0
diff --git a/pkg/idxd/plugin_test.go b/pkg/idxd/plugin_test.go
@@ -39,7 +39,10 @@ func getFakeDevNodes(devDir, charDevDir, wqName string) ([]pluginapi.DeviceSpec,
 
 	var devNum, queueNum int
 
-	fmt.Sscanf(wqName, "wq%d.%d", &devNum, &queueNum)
+	if _, err := fmt.Sscanf(wqName, "wq%d.%d", &devNum, &queueNum); err != nil {
+		return []pluginapi.DeviceSpec{}, err
+	}
+
 	charDevPath := path.Join(charDevDir, fmt.Sprintf("%d:%d", dsaMajor, devNum*10+queueNum))
 
 	return []pluginapi.DeviceSpec{
