Skip to content

Commit 6ac853f

Browse files
committed
Update Debian base images to latest
- debian-base:bullseye-v1.3.0 - debian-iptables:bullseye-v1.4.0 - setcap:bullseye-v1.3.0
1 parent 11479ac commit 6ac853f

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

build/common.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
9090
readonly KUBE_CONTAINER_RSYNC_PORT=8730
9191

9292
# These are the default versions (image tags) for their respective base images.
93-
readonly __default_debian_iptables_version=bullseye-v1.3.0
93+
readonly __default_debian_iptables_version=bullseye-v1.4.0
9494
readonly __default_go_runner_version=v2.3.1-go1.18.3-bullseye.0
95-
readonly __default_setcap_version=bullseye-v1.2.0
95+
readonly __default_setcap_version=bullseye-v1.3.0
9696

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

build/dependencies.yaml

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

117117
# Base images
118118
- name: "registry.k8s.io/debian-base: dependents"
119-
version: bullseye-v1.2.0
119+
version: bullseye-v1.3.0
120120
refPaths:
121121
- path: cluster/images/etcd/Makefile
122122
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-]+)*))?)
@@ -132,7 +132,7 @@ dependencies:
132132
match: BASE_IMAGE_VERSION\?=
133133

134134
- name: "registry.k8s.io/debian-iptables: dependents"
135-
version: bullseye-v1.3.0
135+
version: bullseye-v1.4.0
136136
refPaths:
137137
- path: build/common.sh
138138
match: __default_debian_iptables_version=
@@ -208,7 +208,7 @@ dependencies:
208208
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
209209

210210
- name: "registry.k8s.io/setcap: dependents"
211-
version: bullseye-v1.2.0
211+
version: bullseye-v1.3.0
212212
refPaths:
213213
- path: build/common.sh
214214
match: __default_setcap_version=

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:bullseye-v1.2.0
95+
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.3.0
9696
endif
9797
ifeq ($(ARCH),arm)
98-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.2.0
98+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.3.0
9999
endif
100100
ifeq ($(ARCH),arm64)
101-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.2.0
101+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.3.0
102102
endif
103103
ifeq ($(ARCH),ppc64le)
104-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
104+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.3.0
105105
endif
106106
ifeq ($(ARCH),s390x)
107-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.2.0
107+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.3.0
108108
endif
109109

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

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?=bullseye-v1.2.0
36+
BASE_IMAGE_VERSION?=bullseye-v1.3.0
3737
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
3838

3939
# Keep debian releases (e.g. debian 11 == bullseye) consistent

test/utils/image/manifest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
242242
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"}
243243
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
244244
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
245-
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"}
245+
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.4.0"}
246246
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"}
247247
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.4-0"}
248248
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}

0 commit comments

Comments
 (0)