From cddd83c99765a13835d7c6f01844f5b27a18a499 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 13 Apr 2022 16:13:09 -0400 Subject: [PATCH 1/2] Update Debian base images - debian-base:bullseye-v1.2.0 - debian-iptables:bullseye-v1.3.0 - setcap:bullseye-v1.2.0 Signed-off-by: Stephen Augustus --- 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 64482cb0903..e5c4185f897 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.1.0 +readonly __default_debian_iptables_version=bullseye-v1.3.0 readonly __default_go_runner_version=v2.3.1-go1.18.1-bullseye.0 -readonly __default_setcap_version=bullseye-v1.0.0 +readonly __default_setcap_version=bullseye-v1.2.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 10323ab4e66..28dba271e37 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -114,7 +114,7 @@ dependencies: # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: bullseye-v1.0.0 + version: bullseye-v1.2.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-]+)*))?) @@ -130,7 +130,7 @@ dependencies: match: BASE_IMAGE_VERSION\?= - name: "k8s.gcr.io/debian-iptables: dependents" - version: bullseye-v1.1.0 + version: bullseye-v1.3.0 refPaths: - path: build/common.sh match: __default_debian_iptables_version= @@ -206,7 +206,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "k8s.gcr.io/setcap: dependents" - version: bullseye-v1.0.0 + version: bullseye-v1.2.0 refPaths: - path: build/common.sh match: __default_setcap_version= diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 49b7fb7f380..384ef72b72c 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?=k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.0.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.2.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.0.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.2.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.0.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.2.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.0.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.2.0 endif BASE.windows = mcr.microsoft.com/windows/nanoserver diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index d2c493e256e..4f11139ccde 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?=bullseye-v1.0.0 +BASE_IMAGE_VERSION?=bullseye-v1.2.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 5c1332184a0..b068017b93c 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -240,7 +240,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]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.1.0"} + configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.1-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} From b0f3f015d7748951a4ec60682ed27efc72984f2e Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Wed, 13 Apr 2022 21:27:09 +0200 Subject: [PATCH 2/2] Build etcd v3.5.3 image Co-authored-by: Stephen Augustus --- build/dependencies.yaml | 15 ++++++++------- cluster/images/etcd/Makefile | 8 ++++---- cluster/images/etcd/migrate/options.go | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 28dba271e37..f73d1e25f73 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -72,12 +72,19 @@ dependencies: match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"} - name: "etcd-image" - version: 3.6.0-alpha.0 + version: 3.5.3 refPaths: - path: cluster/images/etcd/Makefile match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\? - path: cluster/images/etcd/migrate/options.go + # From https://github.com/etcd-io/etcd/blob/main/Makefile + - name: "golang: etcd release version" + version: 1.16.15 # for etcd v3.5.3: https://github.com/etcd-io/etcd/blob/0452feec719fa8ad88ae343e66e9bb222965d75d/Makefile#L58 + refPaths: + - path: cluster/images/etcd/Makefile + match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' + # Golang - name: "golang: upstream version" version: 1.18.1 @@ -101,12 +108,6 @@ dependencies: #- path: hack/lib/golang.sh # match: minimum_go_version=go([0-9]+\.[0-9]+) - - name: "golang: etcd release version" - version: 1.16.12 - refPaths: - - path: cluster/images/etcd/Makefile - match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - - name: "k8s.gcr.io/kube-cross: dependents" version: v1.24.0-go1.18.1-bullseye.0 refPaths: diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 384ef72b72c..c028e80e515 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -15,7 +15,7 @@ # Build the etcd image # # Usage: -# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) +# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # # The image contains different etcd versions to simplify # upgrades. Thus be careful when removing any versions from here. @@ -26,10 +26,10 @@ # Except from etcd-$(version) and etcdctl-$(version) binaries, we also # need etcd and etcdctl binaries for backward compatibility reasons. # That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS). -BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0 +BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3 # LATEST_ETCD_VERSION identifies the most recent etcd version available. -LATEST_ETCD_VERSION?=3.6.0-alpha.0 +LATEST_ETCD_VERSION?=3.5.3 # 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 @@ -83,7 +83,7 @@ endif # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases. -GOLANG_VERSION?=1.16.12 +GOLANG_VERSION?=1.16.15 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/cluster/images/etcd/migrate/options.go b/cluster/images/etcd/migrate/options.go index 03b7d3e7c3a..551f1b3dcac 100644 --- a/cluster/images/etcd/migrate/options.go +++ b/cluster/images/etcd/migrate/options.go @@ -28,7 +28,7 @@ import ( ) var ( - supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.2", "3.6.0-alpha.0"} + supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.3"} ) const (