From 3b1851700be8c18b9360c342a6a1f75a988ffca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 25 May 2021 22:46:27 +0200 Subject: [PATCH] Update debian-base to buster-v1.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- build/dependencies.yaml | 2 +- build/workspace.bzl | 18 +++++++++--------- cluster/images/etcd/Makefile | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 7c54dd0f4f850..274525e362ea0 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -120,7 +120,7 @@ dependencies: # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: buster-v1.2.0 + version: buster-v1.7.0 refPaths: - path: build/workspace.bzl match: tag = diff --git a/build/workspace.bzl b/build/workspace.bzl index 509bc8c46ef51..b12e6e67d925f 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -74,15 +74,15 @@ def cri_tarballs(): # Use skopeo to find these values: https://github.com/containers/skopeo # # Example -# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/debian-base:buster-v1.2.0 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:buster-v1.2.0 +# Manifest: skopeo inspect docker://k8s.gcr.io/build-image/debian-base:buster-v1.7.0 +# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/debian-base:buster-v1.7.0 _DEBIAN_BASE_DIGEST = { - "manifest": "sha256:ea668d3febd312e0edfbbdab6bd7d86448ddc8fddb484e20ec76b36a7aeac04c", - "amd64": "sha256:2f3e61995bcd4b3a1a0aef49e4a7a6817c978031734b09df2aaaa28181898b0e", - "arm": "sha256:d1073dcf8f1d55fbbd297e5b280375b6f276ea83a08a25fd59dc4f3ca43c6d50", - "arm64": "sha256:dadcff1ab81177de4914f6db0e7d78a52e525daf7a1efb246cb3545de5e818d1", - "ppc64le": "sha256:bfb24dc0d1e71e1deb0f04a078fadf2c94070266746b1b5acc4e739aa57d5601", - "s390x": "sha256:cfe6a3508b7ee198cb5a0b3a62e0981676b1dfa4b3049f36398d03e6bd35a801", + "manifest": "sha256:08c14f378308dd053bca28f64ab4cbfbca469c8ce5b2831fc3c267adbdc2ae6a", + "amd64": "sha256:bfed8b269fcb8333845a55560ef35e66e71998bd4be33a6b92302f5cbe9ab181", + "arm": "sha256:52722bb698a8d742148c9075f3261f442f3e7bc9d12bcc9c96a045d24d27ffd4", + "arm64": "sha256:0ac88bfb3df67f63bc328cd23610959310c8bc36377662de3220c7c0c15f6dbd", + "ppc64le": "sha256:4bc9d7fa374f3e065ed4c62ac815806afe2e519bc4a9d94786e70fe88e5acc42", + "s390x": "sha256:3045c5d5e716ce22cf0131b4d34bac99a7539e952546e4e8cb20739079bf6401", } # Use skopeo to find these values: https://github.com/containers/skopeo @@ -137,7 +137,7 @@ def image_dependencies(): registry = "k8s.gcr.io/build-image", repository = "debian-base", # Ensure the digests above are updated to match a new tag - tag = "buster-v1.2.0", # ignored, but kept here for documentation + tag = "buster-v1.7.0", # ignored, but kept here for documentation ) container_pull( diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 3ea3a950a19bc..69e925fbbea66 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.2.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.7.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.2.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.7.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.2.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.7.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.2.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.7.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.2.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.7.0 endif RUNNERIMAGE?=gcr.io/distroless/static:latest