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 conformance image to use debian-base:buster-v1.9.0 #104696

Merged
merged 1 commit into from
Sep 13, 2021
Merged

Update conformance image to use debian-base:buster-v1.9.0 #104696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ dependencies:
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:[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: test/conformance/image/Makefile
match: BASE_IMAGE_VERSION\?=

- name: "k8s.gcr.io/debian-iptables: dependents"
version: buster-v1.6.6
Expand Down
13 changes: 6 additions & 7 deletions test/conformance/image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/

# This is defined in root Makefile, but some build contexts do not refer to them
KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io
BASE_IMAGE_VERSION?=buster-v1.9.0
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}

ifeq ($(ARCH),amd64)
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base:v2.1.3
else
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:v2.1.3
endif

RUNNERIMAGE?=gcr.io/distroless/base:latest
# Keep debian releases (e.g. debian 10 == buster) consistent
# between BASE_IMAGE_VERSION and DISTROLESS_IMAGE images
DISTROLESS_IMAGE?=base-debian10
RUNNERIMAGE?=gcr.io/distroless/${DISTROLESS_IMAGE}:latest

TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)

Expand Down