Skip to content

Commit 597b547

Browse files
committed
Bump images, dependencies and versions to go 1.24.0
Signed-off-by: cpanato <[email protected]>
1 parent 3d9fcb7 commit 597b547

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23.6
1+
1.24.0

build/build-image/cross/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.33.0-go1.23.6-bullseye.0
1+
v1.33.0-go1.24.0-bullseye.0

build/common.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
9797
readonly KUBE_CONTAINER_RSYNC_PORT=8730
9898

9999
# These are the default versions (image tags) for their respective base images.
100-
readonly __default_distroless_iptables_version=v0.6.8
101-
readonly __default_go_runner_version=v2.4.0-go1.23.6-bookworm.0
100+
readonly __default_distroless_iptables_version=v0.7.3
101+
readonly __default_go_runner_version=v2.4.0-go1.24.0-bookworm.0
102102
readonly __default_setcap_version=bookworm-v1.0.4
103103

104104
# These are the base images for the Docker-wrapped binaries.

build/dependencies.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dependencies:
116116

117117
# Golang
118118
- name: "golang: upstream version"
119-
version: 1.23.6
119+
version: 1.24.0
120120
refPaths:
121121
- path: .go-version
122122
- path: build/build-image/cross/VERSION
@@ -130,8 +130,9 @@ dependencies:
130130
#
131131
# This entry is a stub of the major version to allow dependency checks to
132132
# pass when building Kubernetes using a pre-release of Golang.
133+
133134
- name: "golang: 1.<major>"
134-
version: 1.23
135+
version: 1.24
135136
refPaths:
136137
- path: build/build-image/cross/VERSION
137138
- path: hack/lib/golang.sh
@@ -140,7 +141,7 @@ dependencies:
140141
match: golang:([0-9]+\.[0-9]+).0-bullseye
141142

142143
- name: "registry.k8s.io/kube-cross: dependents"
143-
version: v1.33.0-go1.23.6-bullseye.0
144+
version: v1.33.0-go1.24.0-bullseye.0
144145
refPaths:
145146
- path: build/build-image/cross/VERSION
146147

@@ -178,15 +179,15 @@ dependencies:
178179
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
179180

180181
- name: "registry.k8s.io/distroless-iptables: dependents"
181-
version: v0.6.8
182+
version: v0.7.3
182183
refPaths:
183184
- path: build/common.sh
184185
match: __default_distroless_iptables_version=
185186
- path: test/utils/image/manifest.go
186187
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
187188

188189
- name: "registry.k8s.io/go-runner: dependents"
189-
version: v2.4.0-go1.23.6-bookworm.0
190+
version: v2.4.0-go1.24.0-bookworm.0
190191
refPaths:
191192
- path: build/common.sh
192193
match: __default_go_runner_version=

hack/lib/golang.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ kube::golang::set_platform_envs() {
508508

509509
# if CC is defined for platform then always enable it
510510
ccenv=$(echo "$platform" | awk -F/ '{print "KUBE_" toupper($1) "_" toupper($2) "_CC"}')
511-
if [ -n "${!ccenv-}" ]; then
511+
if [ -n "${!ccenv-}" ]; then
512512
export CGO_ENABLED=1
513513
export CC="${!ccenv}"
514514
fi
@@ -551,7 +551,7 @@ EOF
551551
local go_version
552552
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
553553
local minimum_go_version
554-
minimum_go_version=go1.23
554+
minimum_go_version=go1.24
555555
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
556556
kube::log::usage_from_stdin <<EOF
557557
Detected go version: ${go_version[*]}.

staging/publishing/rules.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2420,4 +2420,4 @@ rules:
24202420
- staging/src/k8s.io/externaljwt
24212421
recursive-delete-patterns:
24222422
- '*/.gitattributes'
2423-
default-go-version: 1.23.6
2423+
default-go-version: 1.24.0

staging/src/k8s.io/kms/internal/plugins/_mock/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23.0-bullseye as builder
15+
FROM golang:1.24.0-bullseye as builder
1616

1717
WORKDIR /workspace
1818

test/images/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
1616
GOARM ?= 7
1717
DOCKER_CERT_BASE_PATH ?=
1818
QEMUVERSION=v5.1.0-2
19-
GOLANG_VERSION=1.23.6
19+
GOLANG_VERSION=1.24.0
2020
export
2121

2222
ifndef WHAT

test/utils/image/manifest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
223223
configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"}
224224
configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
225225
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
226-
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.8"}
226+
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.3"}
227227
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.17-0"}
228228
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
229229
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}

0 commit comments

Comments
 (0)