Skip to content

Commit ec21688

Browse files
authored
Merge pull request kubernetes#131937 from cpanato/update-go-1.31
[release-1.31] [go] Bump images, dependencies and versions to go 1.23.9 and distroless iptables
2 parents 16dd861 + d67d7ed commit ec21688

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23.8
1+
1.23.9

build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.31.0-go1.23.8-bullseye.0
1+
v1.31.0-go1.23.9-bullseye.0

build/common.sh

Lines changed: 2 additions & 2 deletions
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.5.13
101-
readonly __default_go_runner_version=v2.4.0-go1.23.8-bookworm.0
100+
readonly __default_distroless_iptables_version=v0.6.10
101+
readonly __default_go_runner_version=v2.4.0-go1.23.9-bookworm.0
102102
readonly __default_setcap_version=bookworm-v1.0.3
103103

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

build/dependencies.yaml

Lines changed: 4 additions & 4 deletions
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.8
119+
version: 1.23.9
120120
refPaths:
121121
- path: .go-version
122122
- path: build/build-image/cross/VERSION
@@ -139,7 +139,7 @@ dependencies:
139139
# match: minimum_go_version=go([0-9]+\.[0-9]+)
140140

141141
- name: "registry.k8s.io/kube-cross: dependents"
142-
version: v1.31.0-go1.23.8-bullseye.0
142+
version: v1.31.0-go1.23.9-bullseye.0
143143
refPaths:
144144
- path: build/build-image/cross/VERSION
145145

@@ -177,15 +177,15 @@ dependencies:
177177
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-]+)*))?)
178178

179179
- name: "registry.k8s.io/distroless-iptables: dependents"
180-
version: v0.5.13
180+
version: v0.6.10
181181
refPaths:
182182
- path: build/common.sh
183183
match: __default_distroless_iptables_version=
184184
- path: test/utils/image/manifest.go
185185
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
186186

187187
- name: "registry.k8s.io/go-runner: dependents"
188-
version: v2.4.0-go1.23.8-bookworm.0
188+
version: v2.4.0-go1.23.9-bookworm.0
189189
refPaths:
190190
- path: build/common.sh
191191
match: __default_go_runner_version=

staging/publishing/rules.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2898,4 +2898,4 @@ rules:
28982898
- staging/src/k8s.io/endpointslice
28992899
recursive-delete-patterns:
29002900
- '*/.gitattributes'
2901-
default-go-version: 1.23.8
2901+
default-go-version: 1.23.9

test/images/Makefile

Lines changed: 1 addition & 1 deletion
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.8
19+
GOLANG_VERSION=1.23.9
2020
export
2121

2222
ifndef WHAT

test/utils/image/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
229229
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
230230
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
231231
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
232-
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.13"}
232+
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.10"}
233233
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"}
234234
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
235235
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}

0 commit comments

Comments
 (0)