Skip to content

Commit e7debb7

Browse files
authored
Merge pull request #1036 from ndbaker1/release-1.27
Bump go mod version
2 parents 87c2fac + ef2b7eb commit e7debb7

File tree

8 files changed

+38
-10
lines changed

8 files changed

+38
-10
lines changed

.github/workflows/deps.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ jobs:
2222
- id: govulncheck
2323
uses: golang/govulncheck-action@v1
2424
with:
25-
go-version-input: 1.21.11
2625
go-version-file: go.mod
2726
- id: govulncheck-tests-e2e
2827
uses: golang/govulncheck-action@v1
2928
with:
30-
go-version-input: 1.21.11
31-
go-version-file: tests/e2e/go.mod
29+
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.21.11-bookworm.0
1+
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.7-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.21.11
17+
ARG GOLANG_IMAGE=golang:1.22.7
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.21.11-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.7-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.21.11-bookworm'
20+
- name: 'docker.io/library/golang:1.22.7-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.20
3+
go 1.22.7
44

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

go.sum

Lines changed: 30 additions & 0 deletions
Large diffs are not rendered by default.

hack/e2e/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ if [[ "${UP}" = "yes" ]]; then
131131
--create-args="--dns=none --zones=${ZONES} --node-size=m5.large --master-size=m5.large --override=cluster.spec.cloudControllerManager.cloudProvider=aws --override=cluster.spec.cloudControllerManager.image=${IMAGE_NAME}:${IMAGE_TAG}" \
132132
--admin-access="0.0.0.0/0" \
133133
--kubernetes-version="${KUBERNETES_VERSION}" \
134-
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
134+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
135135

136136
# Use the kops tester once we have a way of consuming an arbitrary e2e.test binary.
137137
#--test=kops \

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.18
3+
go 1.22.7
44

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

0 commit comments

Comments
 (0)