golang: upgrade to 1.22.7

Fixes Vulnerability #1: GO-2024-3106 Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
confidential-containers · Sep 10, 2024 · 899b805 · 899b805
1 parent a4d4917
commit 899b805
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
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.12-39
+ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.22.7-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.12-39
+ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.22.7-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/go.mod b/src/cloud-api-adaptor/go.mod
@@ -1,6 +1,6 @@
 module github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1

diff --git a/src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh b/src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # FIXME to pickup these values from versions.yaml
-GO_VERSION="1.21.12"
+GO_VERSION="1.22.7"
 RUST_VERSION="1.75.0"
 
 # Install dependencies

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" | "s390_64"
 ARG PROTOC_ARCH="x86_64"
-ARG GO_VERSION="1.21.12"
+ARG GO_VERSION="1.22.7"
 ARG PROTOC_VERSION="3.15.0"
 ARG RUST_VERSION="1.75.0"
 ARG YQ_VERSION="v4.35.1"

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" | "s390_64"
 ARG PROTOC_ARCH="x86_64"
-ARG GO_VERSION="1.21.12"
+ARG GO_VERSION="1.22.7"
 ARG PROTOC_VERSION="3.15.0"
 ARG RUST_VERSION="1.75.0"
 ARG YQ_VERSION="v4.35.1"

diff --git a/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder.rhel b/src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder.rhel
@@ -12,7 +12,7 @@ ARG ARCH="amd64"
 ARG YQ_ARCH="amd64"
 # PROTOC_ARCH="x86_64" | "s390_64"
 ARG PROTOC_ARCH="x86_64"
-ARG GO_VERSION="1.21.12"
+ARG GO_VERSION="1.22.7"
 ARG PROTOC_VERSION="3.15.0"
 ARG RUST_VERSION="1.75.0"
 ARG YQ_VERSION="v4.35.1"

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.12                                                      | Go version                                                      |
+| GO\_VERSION       | 1.22.7                                                       | Go version                                                      |
 | PROTOC\_VERSION   | 3.15.0                                                       | [Protobuf](https://github.com/protocolbuffers/protobuf) version |
 | RUST\_VERSION     | 1.75.0                                                       | Rust version                                                    |
 | YQ\_VERSION       | v4.35.1                                                      | [yq](https://github.com/mikefarah/yq/) version                  |

diff --git a/src/cloud-api-adaptor/podvm/go.mod b/src/cloud-api-adaptor/podvm/go.mod
@@ -4,4 +4,4 @@
 
 module github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/podvm
 
-go 1.20
+go 1.22
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.12
+  golang: 1.22.7
   rust: 1.75.0
   protoc: 3.15.0
   packer: v1.9.4

diff --git a/src/cloud-providers/go.mod b/src/cloud-providers/go.mod
@@ -1,6 +1,6 @@
 module github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers
 
-go 1.21
+go 1.22
 
 require (
 	cloud.google.com/go/compute v1.23.3

diff --git a/src/csi-wrapper/go.mod b/src/csi-wrapper/go.mod
@@ -1,6 +1,6 @@
 module github.com/confidential-containers/cloud-api-adaptor/src/csi-wrapper
 
-go 1.21
+go 1.22
 
 require (
 	github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor v0.9.0

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.12-39 AS builder
+FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.22.7-39 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG CGO_ENABLED=1

diff --git a/src/peerpod-ctrl/go.mod b/src/peerpod-ctrl/go.mod
@@ -1,6 +1,6 @@
 module github.com/confidential-containers/cloud-api-adaptor/src/peerpod-ctrl
 
-go 1.21
+go 1.22
 
 require (
 	github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers v0.9.0

diff --git a/src/webhook/Dockerfile b/src/webhook/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/src/webhook/go.mod b/src/webhook/go.mod
@@ -1,6 +1,6 @@
 module github.com/confidential-containers/cloud-api-adaptor/src/webhook
 
-go 1.21
+go 1.22
 
 require (
 	k8s.io/api v0.29.6
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		module github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/podvm

		go 1.20
		go 1.22