Merge pull request #127166 from cpanato/update-setcap

update debian-base and setcap to bookworm-v1.0.4
This commit is contained in:
Kubernetes Prow Robot 2024-09-09 04:56:33 +01:00 committed by GitHub
commit 92507eaabe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 39 additions and 39 deletions

View File

@ -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.6.2
readonly __default_go_runner_version=v2.3.1-go1.23.0-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.3
readonly __default_setcap_version=bookworm-v1.0.4
# 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}"

View File

@ -144,7 +144,7 @@ dependencies:
# Base images
- name: "registry.k8s.io/debian-base: dependents"
version: bookworm-v1.0.3
version: bookworm-v1.0.4
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-]+)*))?)
@ -244,7 +244,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "registry.k8s.io/build-image/setcap: dependents"
version: bookworm-v1.0.3
version: bookworm-v1.0.4
refPaths:
- path: build/common.sh
match: __default_setcap_version=

View File

@ -3214,7 +3214,7 @@ spec:
- name: vol
containers:
- name: pv-recycler
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
command:
- /bin/sh
args:

View File

@ -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.3
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
endif
BASE.windows = mcr.microsoft.com/windows/nanoserver

View File

@ -984,7 +984,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
Containers: []v1.Container{
{
Name: "pv-recycler",
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3",
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.4",
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{

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
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
BASE_IMAGE_VERSION?=bookworm-v1.0.3
BASE_IMAGE_VERSION?=bookworm-v1.0.4
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)

View File

@ -1,7 +1,7 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

View File

@ -1,5 +1,5 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4

View File

@ -1,4 +1,4 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4

View File

@ -1,4 +1,4 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4

View File

@ -1,5 +1,5 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4

View File

@ -1,7 +1,7 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022