Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

security: bump golang 1.21.10 to fix GO-2024-2824 #1836

Merged
merged 1 commit into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions hack/Dockerfile.golang
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
ARG GO_LINUX_ARM64_SHA256=4d169d9cf3dde1692b81c0fd9484fa28d8bc98f672d06bf9db9c75ada73c5fbc
ARG GO_LINUX_AMD64_SHA256=f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea
ARG GO_LINUX_PPC64LE_SHA256=6eadde4149c36dae7d9a9bd9385285db1d0e2988350822f4c72a5eb11ffbfffc
ARG GO_LINUX_S390X_SHA256=05daee44fc4771b2a2471b678a812de2488f05110976faeb8bbbae740e01e7ae
ARG GO_VERSION=1.21.10
ARG GO_LINUX_ARM64_SHA256=428e0b9ecab5762b7c2be000ad1be6f432dccfcd99bb8b8aeeb757d987bfda9d
ARG GO_LINUX_AMD64_SHA256=e330e5d977bf4f3bdc157bc46cf41afa5b13d66c914e12fd6b694ccda65fcf92
ARG GO_LINUX_PPC64LE_SHA256=069869a483e1e4823dd125ef1a30c2f4c4be7c290e50ed3b4bb0e78614c1e69c
ARG GO_LINUX_S390X_SHA256=527ad992ec891626e5a46406a89ad877e1a547cca9ecf93542eb0595261e5080

FROM base AS base-amd64
ADD --checksum=sha256:${GO_LINUX_AMD64_SHA256} https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz .
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BUILD_TYPE=dev
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.9-38
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.10-38
ARG BASE=registry.fedoraproject.org/fedora:38

# This dockerfile uses Go cross-compilation to build the binary,
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/docs/addnewprovider.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-38
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.10-38
FROM --platform="\$TARGETPLATFORM" \$BUILDER_BASE AS builder
RUN dnf install -y libvirt-devel && dnf clean all
WORKDIR /work
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

GO_VERSION="1.21.9"
GO_VERSION="1.21.10"
RUST_VERSION="1.72.0"
SKOPEO_VERSION="1.5.0"

Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder
Original file line number Diff line number Diff line change
Expand Up @@ -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.9"
ARG GO_VERSION="1.21.10"
ARG PROTOC_VERSION="3.15.0"
ARG RUST_VERSION="1.72.0"
ARG YQ_VERSION="v4.35.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.9"
ARG GO_VERSION="1.21.10"
ARG PROTOC_VERSION="3.15.0"
ARG RUST_VERSION="1.72.0"
ARG YQ_VERSION="v4.35.1"
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/podvm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ currently accepted:
| CAA\_SRC\_REF | main | cloud-api-adaptor repository branch or commit |
| KATA\_SRC | https://github.com/kata-containers/kata-containers | The Kata Containers source repository |
| KATA\_SRC\_BRANCH | CCv0 | The Kata Containers repository branch |
| GO\_VERSION | 1.21.9 | Go version |
| GO\_VERSION | 1.21.10 | 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 |
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cloudimg:

tools:
bats: 1.10.0
golang: 1.21.9
golang: 1.21.10
rust: 1.72.0
protoc: 3.15.0
packer: v1.9.4
Expand Down
4 changes: 2 additions & 2 deletions src/csi-wrapper/Dockerfile.csi_wrappers
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
ARG SOURCE_FROM=remote

##### Builder Dev Image #####
FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.9-38 AS builder-local
FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.10-38 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.9-38 AS builder-remote
FROM --platform=${BUILDPLATFORM} quay.io/confidential-containers/golang-fedora:1.21.10-38 AS builder-remote
ARG BINARY
ARG CAA_SRC="https://github.com/confidential-containers/cloud-api-adaptor"
ARG CAA_SRC_REF="main"
Expand Down
2 changes: 1 addition & 1 deletion src/peerpod-ctrl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.21.9-38 as builder
FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.21.10-38 as builder
ARG TARGETOS
ARG TARGETARCH
ARG CGO_ENABLED=1
Expand Down
Loading