Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update the etcd base image to v1.4.2 #117643

Merged
merged 2 commits into from Apr 27, 2023
+7 −7
Merged

update the etcd base image to v1.4.2 #117643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c8be35
update the etcd base image to v1.4.2
humblec Apr 27, 2023
6b40cd8
update test/conformance/image version to v1.4.2
humblec Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/dependencies.yaml
View file
Open in desktop
Expand Up @@ -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-]+)*))?)
Expand Down
10 changes: 5 additions & 5 deletions cluster/images/etcd/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/conformance/image/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down