Merge pull request #1990 from mythi/PR-2025-004

tkatila · web-flow · commit 3c06051c04d5 · 2025-02-18T10:04:01.000+02:00
build: use Go 1.24
diff --git a/.github/workflows/lib-validate.yaml b/.github/workflows/lib-validate.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6
         with:
-          version: v1.63.1
+          version: v1.64.5
           args: -v --timeout 5m
   build:
     name: Build and check device plugins
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ EXTRA_BUILD_ARGS ?= ""
 
 CERT_MANAGER_VERSION ?= v1.15.2
 CONTROLLER_GEN_VERSION ?= v0.17.0
-GOLANGCI_LINT_VERSION ?= v1.63.1
+GOLANGCI_LINT_VERSION ?= v1.64.5
 KIND_VERSION ?= v0.23.0
 GOLICENSES_VERSION ?= v1.6.0
 # Default bundle image tag
@@ -170,7 +170,7 @@ e2e-spr:
 
 pre-pull:
 ifeq ($(TAG),devel)
-	@$(BUILDER) pull golang:1.23-bookworm
+	@$(BUILDER) pull golang:1.24-bookworm
 	@$(BUILDER) pull debian:unstable-slim
 	@$(BUILDER) pull ubuntu:22.04
 endif
diff --git a/build/docker/build-image.sh b/build/docker/build-image.sh
@@ -31,7 +31,7 @@ fi
 
 BUILD_ARGS="${BUILD_ARGS} \
     --build-arg FINAL_BASE=gcr.io/distroless/static \
-    --build-arg BUILD_BASE=golang:1.23-bookworm \
+    --build-arg BUILD_BASE=golang:1.24-bookworm \
     --build-arg FINAL_BASE_DYN=debian:unstable-slim \
     --build-arg ROCKYLINUX=0"
 
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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-bookworm
 ###
 FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
diff --git a/build/docker/intel-gpu-levelzero.Dockerfile b/build/docker/intel-gpu-levelzero.Dockerfile
@@ -35,7 +35,7 @@ ENV LDFLAGS="all=-linkmode=external -s -w"
 ARG GOLICENSES_VERSION
 ARG CMD
 ARG ROCKYLINUX
-ARG CGO_VERSION=1.23
+ARG CGO_VERSION=1.24
 RUN mkdir /runtime
 RUN if [ $ROCKYLINUX -eq 0 ]; then \
         apt-get update && apt-get install --no-install-recommends -y wget libc6-dev ca-certificates ocl-icd-libopencl1 && \
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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-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.23-bookworm
+ARG GOLANG_BASE=golang:1.24-bookworm
 ###
diff --git a/build/docker/templates/intel-gpu-levelzero.Dockerfile.in b/build/docker/templates/intel-gpu-levelzero.Dockerfile.in
@@ -26,7 +26,7 @@ ENV LDFLAGS="all=-linkmode=external -s -w"
 ARG GOLICENSES_VERSION
 ARG CMD
 ARG ROCKYLINUX
-ARG CGO_VERSION=1.23
+ARG CGO_VERSION=1.24
 
 RUN mkdir /runtime
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/intel/intel-device-plugins-for-kubernetes
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/fsnotify/fsnotify v1.8.0
