From 50cb557cec57d7a5bb4ef672cf26b7506f54d04d Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 9 Aug 2023 10:00:59 +0300 Subject: [PATCH] build: move to Go 1.21.x Signed-off-by: Mikko Ylinen --- Makefile | 2 +- build/docker/intel-deviceplugin-operator.Dockerfile | 2 +- build/docker/intel-dlb-initcontainer.Dockerfile | 2 +- build/docker/intel-dlb-plugin.Dockerfile | 2 +- build/docker/intel-dsa-plugin.Dockerfile | 2 +- build/docker/intel-fpga-admissionwebhook.Dockerfile | 2 +- build/docker/intel-fpga-initcontainer.Dockerfile | 2 +- build/docker/intel-fpga-plugin.Dockerfile | 2 +- build/docker/intel-gpu-fakedev.Dockerfile | 2 +- build/docker/intel-gpu-initcontainer.Dockerfile | 2 +- build/docker/intel-gpu-plugin.Dockerfile | 2 +- build/docker/intel-iaa-plugin.Dockerfile | 2 +- build/docker/intel-qat-initcontainer.Dockerfile | 2 +- build/docker/intel-qat-plugin-kerneldrv.Dockerfile | 2 +- build/docker/intel-qat-plugin.Dockerfile | 2 +- build/docker/intel-sgx-admissionwebhook.Dockerfile | 2 +- build/docker/intel-sgx-initcontainer.Dockerfile | 2 +- build/docker/intel-sgx-plugin.Dockerfile | 2 +- build/docker/intel-vpu-plugin.Dockerfile | 2 +- build/docker/intel-xpumanager-sidecar.Dockerfile | 2 +- build/docker/lib/golang_base.docker | 2 +- go.mod | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 27e903dc..2cdab95c 100644 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ terrascan: pre-pull: ifeq ($(TAG),devel) - @$(BUILDER) pull golang:1.20-bullseye + @$(BUILDER) pull golang:1.21-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 index f2163905..89d2d6b1 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index bbc4b3f6..230d08e4 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 446dd5dc..4b0eac0c 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 9f3f2231..dee977b0 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 193c9327..4f4bda8c 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 668ed27a..74bdef9d 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index a4a2e1c3..15baf94b 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index bf1f9c3a..d67474b5 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index eaaf5f07..2b35c8e0 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index f8a60356..5a4e4f36 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 7a665558..e3630c34 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 70745b7f..b3bb0494 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index a2cb516c..8f7008d6 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 613d5514..387aa9ee 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index b7f53e12..a145f354 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index c81bf6c3..fae82da0 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 9a973458..6829da65 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-bookworm ### FROM ${GOLANG_BASE} as builder ARG DIR=/intel-device-plugins-for-kubernetes diff --git a/build/docker/intel-vpu-plugin.Dockerfile b/build/docker/intel-vpu-plugin.Dockerfile index 99a97e81..deb653b0 100644 --- a/build/docker/intel-vpu-plugin.Dockerfile +++ b/build/docker/intel-vpu-plugin.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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index ab1955c3..913341b6 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-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 index 010778f3..d3b9a944 100644 --- 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.20-bullseye +ARG GOLANG_BASE=golang:1.21-bookworm ### diff --git a/go.mod b/go.mod index 74394e07..d5700205 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/intel/intel-device-plugins-for-kubernetes -go 1.20 +go 1.21 require ( github.com/fsnotify/fsnotify v1.6.0