Skip to content

Commit a3b193c

Browse files
cpanatocpanato
committed
[go] Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base
Signed-off-by: cpanato <ctadeu@gmail.com>
1 parent c8a51aa commit a3b193c

File tree

17 files changed

+50
-50
lines changed

17 files changed

+50
-50
lines changed

‎.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.3
1+
1.22.4

‎build/build-image/cross/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.31.0-go1.22.3-bullseye.0
1+
v1.31.0-go1.22.4-bullseye.0

‎build/common.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ 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.4
101-
readonly __default_go_runner_version=v2.3.1-go1.22.3-bookworm.0
102-
readonly __default_setcap_version=bookworm-v1.0.2
100+
readonly __default_distroless_iptables_version=v0.5.5
101+
readonly __default_go_runner_version=v2.3.1-go1.22.4-bookworm.0
102+
readonly __default_setcap_version=bookworm-v1.0.3
103103

104104
# These are the base images for the Docker-wrapped binaries.
105105
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"

‎build/dependencies.yaml

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

117117
# Golang
118118
- name: "golang: upstream version"
119-
version: 1.22.3
119+
version: 1.22.4
120120
refPaths:
121121
- path: .go-version
122122
- path: build/build-image/cross/VERSION
@@ -138,13 +138,13 @@ dependencies:
138138
match: minimum_go_version=go([0-9]+\.[0-9]+)
139139

140140
- name: "registry.k8s.io/kube-cross: dependents"
141-
version: v1.31.0-go1.22.3-bullseye.0
141+
version: v1.31.0-go1.22.4-bullseye.0
142142
refPaths:
143143
- path: build/build-image/cross/VERSION
144144

145145
# Base images
146146
- name: "registry.k8s.io/debian-base: dependents"
147-
version: bookworm-v1.0.2
147+
version: bookworm-v1.0.3
148148
refPaths:
149149
- path: cluster/images/etcd/Makefile
150150
match: BASEIMAGE\?\=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-]+)*))?)
@@ -176,15 +176,15 @@ dependencies:
176176
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-]+)*))?)
177177

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

186186
- name: "registry.k8s.io/go-runner: dependents"
187-
version: v2.3.1-go1.22.3-bookworm.0
187+
version: v2.3.1-go1.22.4-bookworm.0
188188
refPaths:
189189
- path: build/common.sh
190190
match: __default_go_runner_version=
@@ -244,7 +244,7 @@ dependencies:
244244
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
245245

246246
- name: "registry.k8s.io/build-image/setcap: dependents"
247-
version: bookworm-v1.0.2
247+
version: bookworm-v1.0.3
248248
refPaths:
249249
- path: build/common.sh
250250
match: __default_setcap_version=

‎cluster/gce/gci/configure-helper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3186,7 +3186,7 @@ spec:
31863186
- name: vol
31873187
containers:
31883188
- name: pv-recycler
3189-
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
3189+
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
31903190
command:
31913191
- /bin/sh
31923192
args:

‎cluster/images/etcd/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
9292
DOCKERFILE := ${DOCKERFILE.${OS}}
9393

9494
ifeq ($(ARCH),amd64)
95-
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
95+
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
9696
endif
9797
ifeq ($(ARCH),arm)
98-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
98+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
9999
endif
100100
ifeq ($(ARCH),arm64)
101-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
101+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
102102
endif
103103
ifeq ($(ARCH),ppc64le)
104-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
104+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
105105
endif
106106
ifeq ($(ARCH),s390x)
107-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
107+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
108108
endif
109109

110110
BASE.windows = mcr.microsoft.com/windows/nanoserver

‎pkg/volume/plugins.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
997997
Containers: []v1.Container{
998998
{
999999
Name: "pv-recycler",
1000-
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2",
1000+
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3",
10011001
Command: []string{"/bin/sh"},
10021002
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
10031003
VolumeMounts: []v1.VolumeMount{

‎staging/publishing/rules.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2873,4 +2873,4 @@ rules:
28732873
- staging/src/k8s.io/endpointslice
28742874
recursive-delete-patterns:
28752875
- '*/.gitattributes'
2876-
default-go-version: 1.22.3
2876+
default-go-version: 1.22.4

‎test/conformance/image/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
3333

3434
# This is defined in root Makefile, but some build contexts do not refer to them
3535
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
36-
BASE_IMAGE_VERSION?=bookworm-v1.0.2
36+
BASE_IMAGE_VERSION?=bookworm-v1.0.3
3737
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
3838

3939
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)

‎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.22.3
19+
GOLANG_VERSION=1.22.4
2020
export
2121

2222
ifndef WHAT

‎test/images/nonroot/BASEIMAGE

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
66
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
77
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

‎test/images/pets/peer-finder/BASEIMAGE

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3

‎test/images/pets/redis-installer/BASEIMAGE

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3

‎test/images/pets/zookeeper-installer/BASEIMAGE

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3

‎test/images/regression-issue-74839/BASEIMAGE

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3

‎test/images/resource-consumer/BASEIMAGE

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
66
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
77
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

‎test/utils/image/manifest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
235235
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
236236
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
237237
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
238-
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.4"}
238+
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.5"}
239239
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.14-0"}
240240
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
241241
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}

0 commit comments

Comments
 (0)