From dc5626cc18372a73eeb27cfd91e5e0fb765da5b8 Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Fri, 4 Jun 2021 18:23:49 +0800 Subject: [PATCH] Upgrade debian-base to buster v1.7.1 --- build/dependencies.yaml | 2 +- cluster/images/etcd/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 1df838c00e3..d38224d71ed 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.0 + version: buster-v1.7.1 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 b1c34300963..5ca8f0bfdcd 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.0-rc.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?=0 +REVISION?=1 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) @@ -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.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:buster-v1.7.1 endif ifeq ($(ARCH),arm) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.7.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:buster-v1.7.1 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.7.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:buster-v1.7.1 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.7.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:buster-v1.7.1 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.7.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:buster-v1.7.1 endif RUNNERIMAGE?=gcr.io/distroless/static:latest