Merge pull request #6814 from nilo19/fix/cve

[release-1.27] fix: Bump golang version to v1.22.5 to fix cves
kubernetes-sigs · Aug 13, 2024 · 1662ffe · 1662ffe
2 parents 320d626 + 2c3c5ee
commit 1662ffe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 
 # syntax=docker/dockerfile:1
 
-FROM --platform=linux/amd64 golang:1.20.5-buster AS builder
+FROM --platform=linux/amd64 golang:1.22.6-bookworm AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64
@@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     go build ./cmd/cloud-controller-manager
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
-     make bin/azure-cloud-controller-manager ENABLE_GIT_COMMAND=${ENABLE_GIT_COMMAND} ARCH=${ARCH}
+    make bin/azure-cloud-controller-manager ENABLE_GIT_COMMAND=${ENABLE_GIT_COMMAND} ARCH=${ARCH}
 
 FROM gcr.io/distroless/static
 COPY --from=builder /go/src/sigs.k8s.io/cloud-provider-azure/bin/azure-cloud-controller-manager /usr/local/bin/cloud-controller-manager

diff --git a/cloud-node-manager.Dockerfile b/cloud-node-manager.Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.20.5-buster AS builder
+FROM --platform=linux/amd64 golang:1.22.6-bookworm AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64

diff --git a/e2e.Dockerfile b/e2e.Dockerfile
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.5-buster
+FROM golang:1.22.6-bookworm
 
 WORKDIR /go/src/sigs.k8s.io/cloud-provider-azure
 
 COPY . .
 
 RUN go get github.com/onsi/ginkgo/ginkgo \
-  && go get github.com/onsi/gomega/... \
-  && go mod tidy
+    && go get github.com/onsi/gomega/... \
+    && go mod tidy