Skip to content

Commit 67c7e77

Browse files
authored
Merge pull request kubernetes#126047 from cpanato/upgrade-go-123
[go] Bump images, dependencies and versions to go 1.23rc2
2 parents 4259096 + 9d5a7ff commit 67c7e77

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.5
1+
1.23rc2

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.22.5-bullseye.0
1+
v1.31.0-go1.23rc2-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.6
101-
readonly __default_go_runner_version=v2.3.1-go1.22.5-bookworm.0
100+
readonly __default_distroless_iptables_version=v0.6.1
101+
readonly __default_go_runner_version=v2.3.1-go1.23rc2-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: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ dependencies:
116116

117117
# Golang
118118
- name: "golang: upstream version"
119-
version: 1.22.5
119+
version: 1.23rc2
120120
refPaths:
121121
- path: .go-version
122122
- path: build/build-image/cross/VERSION
123-
- path: staging/publishing/rules.yaml
124-
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
123+
# TODO: remove this when whe have the go1.23 released and not the rc.
124+
# - path: staging/publishing/rules.yaml
125+
# match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
125126
- path: test/images/Makefile
126127
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
127128

@@ -130,15 +131,17 @@ dependencies:
130131
#
131132
# This entry is a stub of the major version to allow dependency checks to
132133
# pass when building Kubernetes using a pre-release of Golang.
133-
- name: "golang: 1.<major>"
134-
version: 1.22
135-
refPaths:
136-
- path: build/build-image/cross/VERSION
137-
- path: hack/lib/golang.sh
138-
match: minimum_go_version=go([0-9]+\.[0-9]+)
134+
135+
# TODO: remove this when whe have the go1.23 released and not the rc.
136+
# - name: "golang: 1.<major>"
137+
# version: 1.22
138+
# refPaths:
139+
# - path: build/build-image/cross/VERSION
140+
# - path: hack/lib/golang.sh
141+
# match: minimum_go_version=go([0-9]+\.[0-9]+)
139142

140143
- name: "registry.k8s.io/kube-cross: dependents"
141-
version: v1.31.0-go1.22.5-bullseye.0
144+
version: v1.31.0-go1.23rc2-bullseye.0
142145
refPaths:
143146
- path: build/build-image/cross/VERSION
144147

@@ -176,15 +179,15 @@ dependencies:
176179
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-]+)*))?)
177180

178181
- name: "registry.k8s.io/distroless-iptables: dependents"
179-
version: v0.5.6
182+
version: v0.6.1
180183
refPaths:
181184
- path: build/common.sh
182185
match: __default_distroless_iptables_version=
183186
- path: test/utils/image/manifest.go
184187
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
185188

186189
- name: "registry.k8s.io/go-runner: dependents"
187-
version: v2.3.1-go1.22.5-bookworm.0
190+
version: v2.3.1-go1.23rc2-bookworm.0
188191
refPaths:
189192
- path: build/common.sh
190193
match: __default_go_runner_version=

hack/lib/golang.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ EOF
538538
local go_version
539539
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
540540
local minimum_go_version
541+
# TODO: Update to go1.23 as soon we are ready to merge this
541542
minimum_go_version=go1.22
542543
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
543544
kube::log::usage_from_stdin <<EOF

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.22.5
19+
GOLANG_VERSION=1.23rc2
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.6"}
232+
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.1"}
233233
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.14-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)