From cbd381f5493fddab1dd72137036afc0961699c5a Mon Sep 17 00:00:00 2001
From: Olivia Song <sonyingy@amazon.com>
Date: Mon, 11 Dec 2023 05:43:15 -0800
Subject: [PATCH] update go version to 1.21.5

---
 .github/workflows/deps.yml |  4 ++--
 .ko.yaml                   |  2 +-
 Dockerfile                 | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
index bb6df79ef7..cd3cf361d5 100644
--- a/.github/workflows/deps.yml
+++ b/.github/workflows/deps.yml
@@ -22,10 +22,10 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.3
+          go-version-input: 1.21.5
           go-version-file: go.mod
       - id: govulncheck-tests-e2e
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.3
+          go-version-input: 1.21.5
           go-version-file: tests/e2e/go.mod
\ No newline at end of file
diff --git a/.ko.yaml b/.ko.yaml
index 35ce0eee7d..814102ff00 100644
--- a/.ko.yaml
+++ b/.ko.yaml
@@ -1 +1 @@
-defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.3-bookworm.0
+defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0
diff --git a/Dockerfile b/Dockerfile
index 8a111162bd..99b183b1c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.21.3
+ARG GOLANG_IMAGE=golang:1.21.5
 
 # The distroless image on which the CPI manager image is built.
 #
@@ -22,7 +22,7 @@ ARG GOLANG_IMAGE=golang:1.21.3
 # deterministic builds. Follow what kubernetes uses to build
 # kube-controller-manager, for example for 1.23.x:
 # https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
-ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.3-bookworm.0
+ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0
 
 ################################################################################
 ##                              BUILD STAGE                                   ##
@@ -41,11 +41,11 @@ COPY go.mod go.sum ./
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=${GOPROXY} \
-		go build \
-		-trimpath \
-		-ldflags="-w -s -X k8s.io/component-base/version.gitVersion=${VERSION}" \
-		-o=aws-cloud-controller-manager \
-		cmd/aws-cloud-controller-manager/main.go
+	go build \
+	-trimpath \
+	-ldflags="-w -s -X k8s.io/component-base/version.gitVersion=${VERSION}" \
+	-o=aws-cloud-controller-manager \
+	cmd/aws-cloud-controller-manager/main.go
 
 ################################################################################
 ##                               MAIN STAGE                                   ##