From 34ae705abf1aea5efbd783d09403cd75c4faf731 Mon Sep 17 00:00:00 2001
From: Kubernetes Prow Robot <20407524+k8s-ci-robot@users.noreply.github.com>
Date: Tue, 11 Nov 2025 05:08:57 -0800
Subject: [PATCH 1/3] Merge pull request #1293 from
 yue9944882/bump-golang-1.24.9

Bump golang to 1.24.9
---
 .ko.yaml        | 2 +-
 Dockerfile      | 4 ++--
 cloudbuild.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ko.yaml b/.ko.yaml
index 250890ba16..1957ce4ed9 100644
--- a/.ko.yaml
+++ b/.ko.yaml
@@ -1 +1 @@
-defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.7-bookworm.0
+defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
diff --git a/Dockerfile b/Dockerfile
index 46399596fa..fa1887da9b 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.22.7
+ARG GOLANG_IMAGE=golang:1.24.9
 
 # The distroless image on which the CPI manager image is built.
 #
@@ -22,7 +22,7 @@ ARG GOLANG_IMAGE=golang:1.22.7
 # 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.22.7-bookworm.0
+ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
 
 ################################################################################
 ##                              BUILD STAGE                                   ##
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 87add5e487..d54a684d63 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -17,7 +17,7 @@ steps:
     - --platform=linux/amd64,linux/arm64
     - .
   # Build cloudbuild artifacts (for attestation)
-  - name: 'docker.io/library/golang:1.22.7-bookworm'
+  - name: 'docker.io/library/golang:1.24.9-bookworm'
     id: cloudbuild-artifacts
     entrypoint: make
     env:

From 51c5964225dd0a2b611ea400a52faac727534982 Mon Sep 17 00:00:00 2001
From: Aditya Potdar <adpotdar@amazon.com>
Date: Mon, 17 Nov 2025 16:29:12 -0800
Subject: [PATCH 2/3] Update Go version to 1.24.9 in go.mod files

---
 go.mod           | 2 +-
 tests/e2e/go.mod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 58ca99bdc2..2ec0e2ae06 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/cloud-provider-aws
 
-go 1.22.7
+go 1.24.9
 
 require (
 	github.com/aws/aws-sdk-go v1.54.6
diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
index de7abebbd0..701d0359fe 100644
--- a/tests/e2e/go.mod
+++ b/tests/e2e/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/cloud-provider-aws/tests/e2e
 
-go 1.22.7
+go 1.24.9
 
 require (
 	github.com/onsi/ginkgo/v2 v2.4.0

From 9dd3a249e7d551d3f5cb49e241fd3de4f0e39801 Mon Sep 17 00:00:00 2001
From: Aditya Potdar <adpotdar@amazon.com>
Date: Tue, 18 Nov 2025 17:01:49 -0800
Subject: [PATCH 3/3] retrigger CLA check