From 531eb712c2cb73a0d2137f1d8f273f21785b0087 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 20 Sep 2021 20:51:32 -0400 Subject: [PATCH 1/4] releng: Update build images to Debian 11 (Bullseye) - debian-base:bullseye-v1.0.0 - debian-iptables:bullseye-v1.0.0 - go-runner:v2.3.1-go1.17.1-bullseye.0 - kube-cross:v1.23.0-go1.17.1-bullseye.0 - setcap:bullseye-v1.0.0 Signed-off-by: Stephen Augustus --- build/build-image/cross/VERSION | 2 +- build/common.sh | 6 +++--- build/dependencies.yaml | 10 +++++----- cluster/images/etcd/Makefile | 10 +++++----- test/conformance/image/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index adf9804e4a6..9f4828a64fd 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.23.0-go1.17.1-buster.0 +v1.23.0-go1.17.1-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 53d348010ba..a9f3073aaa3 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=buster-v1.6.7 -readonly __default_go_runner_version=v2.3.1-go1.17.1-buster.0 -readonly __default_setcap_version=buster-v2.0.4 +readonly __default_debian_iptables_version=bullseye-v1.0.0 +readonly __default_go_runner_version=v2.3.1-go1.17.1-bullseye.0 +readonly __default_setcap_version=bullseye-v1.0.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 fc46125425d..7d60f83c46a 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -114,13 +114,13 @@ dependencies: match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.23.0-go1.17.1-buster.0 + version: v1.23.0-go1.17.1-bullseye.0 refPaths: - path: build/build-image/cross/VERSION # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: buster-v1.9.0 + version: bullseye-v1.0.0 refPaths: - path: cluster/images/etcd/Makefile match: BASEIMAGE\?\=k8s\.gcr\.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-]+)*))?) @@ -136,7 +136,7 @@ dependencies: match: BASE_IMAGE_VERSION\?= - name: "k8s.gcr.io/debian-iptables: dependents" - version: buster-v1.6.7 + version: bullseye-v1.0.0 refPaths: - path: build/common.sh match: __default_debian_iptables_version= @@ -144,7 +144,7 @@ dependencies: match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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-]+)*))?)"} - name: "k8s.gcr.io/go-runner: dependents" - version: v2.3.1-go1.17.1-buster.0 + version: v2.3.1-go1.17.1-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= @@ -208,7 +208,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "k8s.gcr.io/setcap: dependents" - version: buster-v2.0.4 + version: bullseye-v1.0.0 refPaths: - path: build/common.sh match: __default_setcap_version= diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e7cb79a5ff5..a501ad32d7f 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -67,19 +67,19 @@ GOARM?=7 TEMP_DIR:=$(shell mktemp -d) ifeq ($(ARCH),amd64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.9.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.9.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.0.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.9.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.0.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.9.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.0.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.9.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.0.0 endif RUNNERIMAGE?=gcr.io/distroless/static:latest diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index bb74dc8dc7b..3451f17f1d2 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?=k8s.gcr.io -BASE_IMAGE_VERSION?=buster-v1.9.0 +BASE_IMAGE_VERSION?=bullseye-v1.0.0 BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} # Keep debian releases (e.g. debian 10 == buster) consistent diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 92b2ffadf02..a2f8c6beeec 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -208,7 +208,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) { configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"} 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", "buster-v1.6.7"} + configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.0.0"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.4.13-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"} From 8dcaf8433bfff3215f9dd69ca6e4d19df8e458b5 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 20 Sep 2021 21:02:49 -0400 Subject: [PATCH 2/4] cluster/images/etcd: Build 3.5.0-2 image Signed-off-by: Stephen Augustus --- cluster/images/etcd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index a501ad32d7f..bcd026f2cca 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.0 # REVISION provides a version number for this image and all it's bundled # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment # for each revision of this image at that etcd version. -REVISION?=1 +REVISION?=2 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) From 1a15eeef386f6f31a9042903390885c8ec7968fb Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 20 Sep 2021 21:05:06 -0400 Subject: [PATCH 3/4] test/conformance/image: Update runner image to base-debian11 Signed-off-by: Stephen Augustus --- test/conformance/image/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index 3451f17f1d2..d2c493e256e 100644 --- a/test/conformance/image/Makefile +++ b/test/conformance/image/Makefile @@ -36,9 +36,9 @@ KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io BASE_IMAGE_VERSION?=bullseye-v1.0.0 BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} -# Keep debian releases (e.g. debian 10 == buster) consistent +# Keep debian releases (e.g. debian 11 == bullseye) consistent # between BASE_IMAGE_VERSION and DISTROLESS_IMAGE images -DISTROLESS_IMAGE?=base-debian10 +DISTROLESS_IMAGE?=base-debian11 RUNNERIMAGE?=gcr.io/distroless/${DISTROLESS_IMAGE}:latest TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX) From 9bad325cb6f9b77e1a0869a32ab09b30a1a01493 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sun, 26 Sep 2021 15:05:24 +0200 Subject: [PATCH 4/4] kube-cross: update image to v1.23.0-go1.17.1-bullseye.1 Signed-off-by: Carlos Panato --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 9f4828a64fd..fcb3971dc01 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.23.0-go1.17.1-bullseye.0 +v1.23.0-go1.17.1-bullseye.1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 7d60f83c46a..c73dd9e7679 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -114,7 +114,7 @@ dependencies: match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.23.0-go1.17.1-bullseye.0 + version: v1.23.0-go1.17.1-bullseye.1 refPaths: - path: build/build-image/cross/VERSION