Skip to content

Commit a3014ec

Browse files
authored
Merge pull request #1174 from yue9944882/cherrypick-1-29-1135
Cherrypick #1135 to release 1.29
2 parents 933cfde + 7caa87a commit a3014ec

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/deps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- id: govulncheck
2323
uses: golang/govulncheck-action@v1
2424
with:
25-
go-version-input: 1.21.11
25+
go-version-input: 1.24.4
2626
go-version-file: go.mod
2727
- id: govulncheck-tests-e2e
2828
uses: golang/govulncheck-action@v1
2929
with:
30-
go-version-input: 1.21.11
30+
go-version-input: 1.24.4
3131
go-version-file: tests/e2e/go.mod

.ko.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.7-bookworm.0
1+
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.4-bookworm.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.22.7
17+
ARG GOLANG_IMAGE=golang:1.24.4
1818

1919
# The distroless image on which the CPI manager image is built.
2020
#
2121
# Please do not use "latest". Explicit tags should be used to provide
2222
# deterministic builds. Follow what kubernetes uses to build
2323
# kube-controller-manager, for example for 1.23.x:
2424
# https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
25-
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.7-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.4-bookworm.0
2626

2727
################################################################################
2828
## BUILD STAGE ##

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- --platform=linux/amd64,linux/arm64
1818
- .
1919
# Build cloudbuild artifacts (for attestation)
20-
- name: 'docker.io/library/golang:1.22.7-bookworm'
20+
- name: 'docker.io/library/golang:1.24.4-bookworm'
2121
id: cloudbuild-artifacts
2222
entrypoint: make
2323
env:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/cloud-provider-aws
22

3-
go 1.22.7
3+
go 1.24.4
44

55
require (
66
github.com/aws/aws-sdk-go v1.54.6

tests/e2e/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/cloud-provider-aws/tests/e2e
22

3-
go 1.22.7
3+
go 1.24.4
44

55
require (
66
github.com/onsi/ginkgo/v2 v2.9.4

0 commit comments

Comments
 (0)