From 06b057044407af5da6cbcd2013c4ca39e976c5b3 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 14 Sep 2020 08:41:17 -0400 Subject: [PATCH] build: Update to debian-base:buster-v1.2.0 Signed-off-by: Stephen Augustus --- build/dependencies.yaml | 12 ++++++------ build/workspace.bzl | 18 +++++++++--------- cluster/images/etcd/Makefile | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3fed1bd91d5..b6c03444017 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -118,20 +118,20 @@ dependencies: # Base images - name: "k8s.gcr.io/debian-base: dependents" - version: 2.1.3 + version: buster-v1.2.0 refPaths: - path: build/workspace.bzl match: tag = - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:v\d+\.\d+\.\d+ + 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-]+)*))?) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm:[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-]+)*))?) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm64:[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-]+)*))?) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-ppc64le:[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-]+)*))?) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+ + 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.3.0 diff --git a/build/workspace.bzl b/build/workspace.bzl index 44a64856f9f..9e5502270a5 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:v2.1.3 -# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/debian-base:v2.1.3 +# 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 _DEBIAN_BASE_DIGEST = { - "manifest": "sha256:37cfe133a6ff3fc3aa4aa5ab9fda127861902940b8e8078fff7191c7a81be8d8", - "amd64": "sha256:dc06e242160076b72bd75135fb3dd0a9e91f386b2d812ec10cbf9e65864c755d", - "arm": "sha256:9c52e9b31d679102586381fb4a03bba73fc05992adacce31df3db6d2f75f010e", - "arm64": "sha256:9a3ae250d59f317c9cf1f7bf0b61c0d90e70012ee82996867655401968076ee4", - "ppc64le": "sha256:d7c50e06d954bedb1f362ce42380f7a059423f8cbd9e7b426a7f2d73dfb4431a", - "s390x": "sha256:7e6d43baf4972f7faa33f1179fb92ff858a3e0e23f78b96a5821d13199b9da91", + "manifest": "sha256:ea668d3febd312e0edfbbdab6bd7d86448ddc8fddb484e20ec76b36a7aeac04c", + "amd64": "sha256:2f3e61995bcd4b3a1a0aef49e4a7a6817c978031734b09df2aaaa28181898b0e", + "arm": "sha256:d1073dcf8f1d55fbbd297e5b280375b6f276ea83a08a25fd59dc4f3ca43c6d50", + "arm64": "sha256:dadcff1ab81177de4914f6db0e7d78a52e525daf7a1efb246cb3545de5e818d1", + "ppc64le": "sha256:bfb24dc0d1e71e1deb0f04a078fadf2c94070266746b1b5acc4e739aa57d5601", + "s390x": "sha256:cfe6a3508b7ee198cb5a0b3a62e0981676b1dfa4b3049f36398d03e6bd35a801", } # 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 = "v2.1.3", # ignored, but kept here for documentation + tag = "buster-v1.2.0", # ignored, but kept here for documentation ) container_pull( diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 71d1cb11d64..aad687c296f 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:v2.1.3 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.2.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.3 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.2.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.3 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.2.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.3 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.2.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.3 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.2.0 endif RUNNERIMAGE?=gcr.io/distroless/static:latest