mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-10-31 10:18:13 +00:00
Merge pull request #124099 from cpanato/update-set-cap-debian-base
update setcap/debian-base to bookworm-v1.0.2
This commit is contained in:
Kubernetes Prow Robot
@@ -99,7 +99,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
# These are the default versions (image tags) for their respective base images.
|
||||
readonly __default_distroless_iptables_version=v0.5.2
|
||||
readonly __default_go_runner_version=v2.3.1-go1.22.1-bookworm.0
|
||||
readonly __default_setcap_version=bookworm-v1.0.1
|
||||
readonly __default_setcap_version=bookworm-v1.0.2
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
|
||||
|
||||
@@ -144,7 +144,7 @@ dependencies:
|
||||
|
||||
# Base images
|
||||
- name: "registry.k8s.io/debian-base: dependents"
|
||||
version: bookworm-v1.0.1
|
||||
version: bookworm-v1.0.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-]+)*))?)
|
||||
@@ -252,7 +252,7 @@ dependencies:
|
||||
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
|
||||
|
||||
- name: "registry.k8s.io/build-image/setcap: dependents"
|
||||
version: bookworm-v1.0.1
|
||||
version: bookworm-v1.0.2
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_setcap_version=
|
||||
|
||||
@@ -3173,7 +3173,7 @@ spec:
|
||||
- name: vol
|
||||
containers:
|
||||
- name: pv-recycler
|
||||
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.1
|
||||
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
|
||||
command:
|
||||
- /bin/sh
|
||||
args:
|
||||
|
||||
@@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
|
||||
DOCKERFILE := ${DOCKERFILE.${OS}}
|
||||
|
||||
ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.1
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
endif
|
||||
ifeq ($(ARCH),s390x)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
||||
endif
|
||||
|
||||
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
||||
|
||||
@@ -1064,7 +1064,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "pv-recycler",
|
||||
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.1",
|
||||
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2",
|
||||
Command: []string{"/bin/sh"},
|
||||
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
|
||||
VolumeMounts: []v1.VolumeMount{
|
||||
|
||||
@@ -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?=bookworm-v1.0.1
|
||||
BASE_IMAGE_VERSION?=bookworm-v1.0.2
|
||||
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
||||
|
||||
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.1
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
|
||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||
|
||||
Reference in New Issue
Block a user