From 42f9333e7fabba37b70918f5c72794e34327e097 Mon Sep 17 00:00:00 2001 From: Joyce Kung Date: Fri, 25 Jun 2021 20:38:15 -0400 Subject: [PATCH 1/3] Update debian-base image to buster-v1.8.0 --- build/dependencies.yaml | 2 +- cluster/images/etcd/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4ad6e52eebf..3245cf20a63 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -130,7 +130,7 @@ dependencies: # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: buster-v1.7.1 + version: buster-v1.8.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-]+)*))?) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 6f45b170c54..e1c40467f37 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.7.1 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.8.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.7.1 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.8.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.7.1 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.8.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.7.1 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.8.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.7.1 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.8.0 endif RUNNERIMAGE?=gcr.io/distroless/static:latest From 0a8a9188c98ad4ae12ad58174cf065958554bf19 Mon Sep 17 00:00:00 2001 From: Joyce Kung Date: Fri, 25 Jun 2021 20:45:20 -0400 Subject: [PATCH 2/3] Update debian-iptables image to buster-v1.6.5 --- build/common.sh | 2 +- build/dependencies.yaml | 2 +- test/utils/image/manifest.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/common.sh b/build/common.sh index f2d9f2b4cde..73d976d5dee 100755 --- a/build/common.sh +++ b/build/common.sh @@ -86,7 +86,7 @@ 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.2 +readonly __default_debian_iptables_version=buster-v1.6.5 readonly __default_go_runner_version=v2.3.1-go1.16.5-buster.0 readonly __default_setcap_version=buster-v2.0.1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3245cf20a63..0b3eee50d26 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -144,7 +144,7 @@ dependencies: match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[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/debian-iptables: dependents" - version: buster-v1.6.2 + version: buster-v1.6.5 refPaths: - path: build/common.sh match: __default_debian_iptables_version= diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index b4e36504bed..72db6da0c63 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -214,7 +214,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) { configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"} configs[CudaVectorAdd] = Config{list.E2eRegistry, "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.2"} + configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.5"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.3"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.4.13-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"} From aeccadda4ffcb41d686f9f9ce8a1539bb1753fe6 Mon Sep 17 00:00:00 2001 From: Joyce Kung Date: Sat, 26 Jun 2021 15:16:12 -0400 Subject: [PATCH 3/3] Update setcap image to buster-v2.0.3 --- build/common.sh | 2 +- build/dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.sh b/build/common.sh index 73d976d5dee..dd84859f953 100755 --- a/build/common.sh +++ b/build/common.sh @@ -88,7 +88,7 @@ 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.5 readonly __default_go_runner_version=v2.3.1-go1.16.5-buster.0 -readonly __default_setcap_version=buster-v2.0.1 +readonly __default_setcap_version=buster-v2.0.3 # 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 0b3eee50d26..264d59e1f73 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -216,7 +216,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "k8s.gcr.io/setcap: dependents" - version: buster-v2.0.1 + version: buster-v2.0.3 refPaths: - path: build/common.sh match: __default_setcap_version=