versions: Bump to golang 1.21.12

Bump go version to 1.21.12 to resolve vulnerability https://pkg.go.dev/vuln/GO-2024-2963 Signed-off-by: stevenhorsman <[email protected]>
confidential-containers · Jul 3, 2024 · de4b29a · de4b29a
1 parent 94f72ac
commit de4b29a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/hack/Dockerfile.golang b/hack/Dockerfile.golang
@@ -5,11 +5,11 @@ FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} as base
 
 # DO NOT UPDATE THIS BY HAND !!
 # Use hack/update-go-container.sh to update the version and hashes.
-ARG GO_VERSION=1.21.11
-ARG GO_LINUX_ARM64_SHA256=715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241
-ARG GO_LINUX_AMD64_SHA256=54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0
-ARG GO_LINUX_PPC64LE_SHA256=6f5e18187abc4ff1c3173afbe38ef29f84b6d1ee7173f40075a4134863b209a5
-ARG GO_LINUX_S390X_SHA256=489c363d5da2d3d5709419bda61856582c5ebdc7874ca7ecdebf67d736d329e6
+ARG GO_VERSION=1.21.12
+ARG GO_LINUX_ARM64_SHA256=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e
+ARG GO_LINUX_AMD64_SHA256=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
+ARG GO_LINUX_PPC64LE_SHA256=46b2dae42132fd697c6c34a6bee3df8e3288b9f01143eafbcc452b0d2a35b205
+ARG GO_LINUX_S390X_SHA256=3746ddaafedb9f1744a647c51b9c4454b82a699de0f6dffbb2f3cb698a846482
 
 FROM base AS base-amd64
 ADD --checksum=sha256:${GO_LINUX_AMD64_SHA256} https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz .

diff --git a/src/cloud-api-adaptor/Dockerfile b/src/cloud-api-adaptor/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILD_TYPE=dev
-ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.11-39
+ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.12-39
 ARG BASE=registry.fedoraproject.org/fedora:39
 
 # This dockerfile uses Go cross-compilation to build the binary,

diff --git a/src/cloud-api-adaptor/docs/addnewprovider.md b/src/cloud-api-adaptor/docs/addnewprovider.md
@@ -208,7 +208,7 @@ go mod tidy
 ### Step 4: build the external cloud provider plugin file via docker
 ```bash
 cat > Dockerfile <<EOF
-ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.11-39
+ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.12-39
 FROM --platform="\$TARGETPLATFORM" \$BUILDER_BASE AS builder
 RUN dnf install -y libvirt-devel && dnf clean all
 WORKDIR /work

diff --git a/src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh b/src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GO_VERSION="1.21.11"
+GO_VERSION="1.21.12"
 RUST_VERSION="1.72.0"
 SKOPEO_VERSION="1.5.0"
 

diff --git a/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder b/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder
@@ -12,7 +12,7 @@ ARG ARCH="amd64"
 ARG YQ_ARCH="amd64"
 # PROTOC_ARCH="x86_64" | "s390x_64"
 ARG PROTOC_ARCH="x86_64"
-ARG GO_VERSION="1.21.11"
+ARG GO_VERSION="1.21.12"
 ARG PROTOC_VERSION="3.15.0"
 ARG RUST_VERSION="1.72.0"
 ARG YQ_VERSION="v4.35.1"
@@ -31,8 +31,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y build-essential cloud-image-utils curl git gnupg \
-        libdevmapper-dev libgpgme-dev lsb-release pkg-config qemu-kvm \
-        musl-tools unzip wget git && \
+    libdevmapper-dev libgpgme-dev lsb-release pkg-config qemu-kvm \
+    musl-tools unzip wget git && \
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
     echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | tee -a /etc/apt/sources.list && \
     apt-get update && apt-get install -y clang-17 && \

diff --git a/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder.fedora b/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder.fedora
@@ -11,7 +11,7 @@ ARG ARCH="amd64"
 ARG YQ_ARCH="amd64"
 # PROTOC_ARCH="x86_64" | "s390x_64"
 ARG PROTOC_ARCH="x86_64"
-ARG GO_VERSION="1.21.11"
+ARG GO_VERSION="1.21.12"
 ARG PROTOC_VERSION="3.15.0"
 ARG RUST_VERSION="1.72.0"
 ARG YQ_VERSION="v4.35.1"
@@ -21,9 +21,9 @@ ARG YQ_CHECKSUM="sha256:bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2
 
 RUN dnf groupinstall -y 'Development Tools' && \
     dnf install -y yum-utils gnupg git perl-core pkg-config libseccomp-devel gpgme-devel \
-        device-mapper-devel unzip libassuan-devel \
-        perl-FindBin openssl-devel tpm2-tss-devel \
-        clang which && \
+    device-mapper-devel unzip libassuan-devel \
+    perl-FindBin openssl-devel tpm2-tss-devel \
+    clang which && \
     dnf clean all
 
 ADD https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz go${GO_VERSION}.linux-${ARCH}.tar.gz

diff --git a/src/cloud-api-adaptor/podvm/README.md b/src/cloud-api-adaptor/podvm/README.md
@@ -57,7 +57,7 @@ currently accepted:
 
 | Argument          | Default value                                                | Description                                                     |
 | ----------------- | ------------------------------------------------------------ | --------------------------------------------------------------- |
-| GO\_VERSION       | 1.21.11                                                      | Go version                                                      |
+| GO\_VERSION       | 1.21.12                                                      | Go version                                                      |
 | PROTOC\_VERSION   | 3.15.0                                                       | [Protobuf](https://github.com/protocolbuffers/protobuf) version |
 | RUST\_VERSION     | 1.72.0                                                       | Rust version                                                    |
 | YQ\_VERSION       | v4.35.1                                                      | [yq](https://github.com/mikefarah/yq/) version                  |

diff --git a/src/cloud-api-adaptor/versions.yaml b/src/cloud-api-adaptor/versions.yaml
@@ -20,7 +20,7 @@ cloudimg:
 
 tools:
   bats: 1.10.0
-  golang: 1.21.11
+  golang: 1.21.12
   rust: 1.74.0
   protoc: 3.15.0
   packer: v1.9.4

diff --git a/src/csi-wrapper/Dockerfile.csi_wrappers b/src/csi-wrapper/Dockerfile.csi_wrappers
@@ -7,13 +7,13 @@
 ARG SOURCE_FROM=remote
 
 ##### Builder Dev Image #####
-FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.11-39 AS builder-local
+FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.12-39 AS builder-local
 WORKDIR /src
 COPY csi-wrapper ./cloud-api-adaptor/src/csi-wrapper/
 COPY cloud-api-adaptor ./cloud-api-adaptor/src/cloud-api-adaptor
 
 ##### Builder Release Image #####
-FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.11-39 AS builder-remote
+FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.12-39 AS builder-remote
 ARG BINARY
 ARG CAA_SRC="https://github.com/confidential-containers/cloud-api-adaptor"
 ARG CAA_SRC_REF="main"

diff --git a/src/peerpod-ctrl/Dockerfile b/src/peerpod-ctrl/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.21.11-39 as builder
+FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.21.12-39 as builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG CGO_ENABLED=1