From 6ac853fe6067fa88f3753e0225413e74d4118080 Mon Sep 17 00:00:00 2001 From: Wes Panther Date: Mon, 13 Jun 2022 21:35:48 -0700 Subject: [PATCH] Update Debian base images to latest - debian-base:bullseye-v1.3.0 - debian-iptables:bullseye-v1.4.0 - setcap:bullseye-v1.3.0 --- build/common.sh | 4 ++-- build/dependencies.yaml | 6 +++--- cluster/images/etcd/Makefile | 10 +++++----- test/conformance/image/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/common.sh b/build/common.sh index c8ac1fd93b4..6edb7cc6ba6 100755 --- a/build/common.sh +++ b/build/common.sh @@ -90,9 +90,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}" readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. -readonly __default_debian_iptables_version=bullseye-v1.3.0 +readonly __default_debian_iptables_version=bullseye-v1.4.0 readonly __default_go_runner_version=v2.3.1-go1.18.3-bullseye.0 -readonly __default_setcap_version=bullseye-v1.2.0 +readonly __default_setcap_version=bullseye-v1.3.0 # These are the base images for the Docker-wrapped binaries. readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}" diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 0c9d49c397b..78f85f5d0be 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Base images - name: "registry.k8s.io/debian-base: dependents" - version: bullseye-v1.2.0 + version: bullseye-v1.3.0 refPaths: - path: cluster/images/etcd/Makefile 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: match: BASE_IMAGE_VERSION\?= - name: "registry.k8s.io/debian-iptables: dependents" - version: bullseye-v1.3.0 + version: bullseye-v1.4.0 refPaths: - path: build/common.sh match: __default_debian_iptables_version= @@ -208,7 +208,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "registry.k8s.io/setcap: dependents" - version: bullseye-v1.2.0 + version: bullseye-v1.3.0 refPaths: - path: build/common.sh match: __default_setcap_version= diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 076eb876f64..5543cc61f9f 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows DOCKERFILE := ${DOCKERFILE.${OS}} ifeq ($(ARCH),amd64) - BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.2.0 + BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.3.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.2.0 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.3.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.2.0 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.3.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.2.0 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.3.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.2.0 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.3.0 endif BASE.windows = mcr.microsoft.com/windows/nanoserver diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index 9771d7ffd9c..732327d9bc3 100644 --- a/test/conformance/image/Makefile +++ b/test/conformance/image/Makefile @@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/ # This is defined in root Makefile, but some build contexts do not refer to them KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io -BASE_IMAGE_VERSION?=bullseye-v1.2.0 +BASE_IMAGE_VERSION?=bullseye-v1.3.0 BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} # Keep debian releases (e.g. debian 11 == bullseye) consistent diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a67a3ce0e10..dd7aa40c243 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -242,7 +242,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} - configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"} + configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.4.0"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.4-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}