github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119095 from saschagrunert/debian-base-bookworm

Browse Source 
Update debian-base to bookworm
This commit is contained in:
Kubernetes Prow Robot 2023-07-18 02:11:08 -07:00 committed by GitHub
commit d43e6705f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -142,7 +142,7 @@ dependencies:
# Base images # Base images
- name: "registry.k8s.io/debian-base: dependents" - name: "registry.k8s.io/debian-base: dependents"
version: bullseye-v1.4.2 version: bookworm-v1.0.0
refPaths: refPaths:
- path: cluster/images/etcd/Makefile - 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-]+)*))?) 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-]+)*))?)

10
cluster/images/etcd/Makefile
View File

@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}} DOCKERFILE := ${DOCKERFILE.${OS}}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.0
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.4.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.4.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.4.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
endif endif
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.4.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
endif endif
BASE.windows = mcr.microsoft.com/windows/nanoserver BASE.windows = mcr.microsoft.com/windows/nanoserver

3
test/conformance/image/Dockerfile
View File

@ -21,6 +21,9 @@ FROM ${RUNNERIMAGE}
# This is a dependency for `kubectl diff` tests # This is a dependency for `kubectl diff` tests
COPY --from=debbase /usr/bin/diff /usr/local/bin/ COPY --from=debbase /usr/bin/diff /usr/local/bin/
COPY --from=debbase /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu
COPY --from=debbase /lib/x86_64-linux-gnu/libpthread.so.0 /lib/x86_64-linux-gnu
COPY --from=debbase /lib64/ld-linux-x86-64.so.2 /lib64
COPY cluster /kubernetes/cluster COPY cluster /kubernetes/cluster
COPY ginkgo /usr/local/bin/ COPY ginkgo /usr/local/bin/

2
test/conformance/image/Makefile
View File

@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
# This is defined in root Makefile, but some build contexts do not refer to them # This is defined in root Makefile, but some build contexts do not refer to them
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
BASE_IMAGE_VERSION?=bullseye-v1.4.2 BASE_IMAGE_VERSION?=bookworm-v1.0.0
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
# Keep debian releases (e.g. debian 11 == bullseye) consistent # Keep debian releases (e.g. debian 11 == bullseye) consistent