mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-06 18:54:06 +00:00
Merge pull request #117643 from humblec/etcd
update the etcd base image to v1.4.2
This commit is contained in:
commit
3a15029a95
@ -123,7 +123,7 @@ dependencies:
|
||||
|
||||
# Base images
|
||||
- name: "registry.k8s.io/debian-base: dependents"
|
||||
version: bullseye-v1.3.0
|
||||
version: bullseye-v1.4.2
|
||||
refPaths:
|
||||
- path: cluster/images/etcd/Makefile
|
||||
match: BASEIMAGE\?\=registry\.k8s\.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-]+)*))?)
|
||||
|
@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
|
||||
DOCKERFILE := ${DOCKERFILE.${OS}}
|
||||
|
||||
ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.3.0
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.3.0
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.4.2
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.3.0
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.4.2
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.3.0
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.4.2
|
||||
endif
|
||||
ifeq ($(ARCH),s390x)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.3.0
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.4.2
|
||||
endif
|
||||
|
||||
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
||||
|
@ -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?=registry.k8s.io
|
||||
BASE_IMAGE_VERSION?=bullseye-v1.3.0
|
||||
BASE_IMAGE_VERSION?=bullseye-v1.4.2
|
||||
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
||||
|
||||
# Keep debian releases (e.g. debian 11 == bullseye) consistent
|
||||
|
Loading…
Reference in New Issue
Block a user