mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-02-18 18:28:18 -05:00
update debian-base and setcap
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
This commit is contained in:
Carlos Panato
parent
15154374bc
commit
96a9fe5f7b
11 changed files with 35 additions and 35 deletions
|
|
@ -149,7 +149,7 @@ dependencies:
|
|||
|
||||
# Base images
|
||||
- name: "registry.k8s.io/debian-base: dependents"
|
||||
version: bookworm-v1.0.4
|
||||
version: bookworm-v1.0.6
|
||||
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-]+)*))?)
|
||||
|
|
@ -247,7 +247,7 @@ dependencies:
|
|||
match: pause\s
|
||||
|
||||
- name: "registry.k8s.io/build-image/setcap: dependents"
|
||||
version: bookworm-v1.0.4
|
||||
version: bookworm-v1.0.6
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_setcap_version=
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ TEMP_DIR:=$(shell mktemp -d)
|
|||
VERSION=v9.1.8
|
||||
KUBECTL_VERSION?=v1.32.2
|
||||
|
||||
BASEIMAGE=registry.k8s.io/build-image/debian-base-$(ARCH):bookworm-v1.0.4
|
||||
BASEIMAGE=registry.k8s.io/build-image/debian-base-$(ARCH):bookworm-v1.0.6
|
||||
|
||||
SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
|
||||
|
||||
|
|
|
|||
|
|
@ -3205,7 +3205,7 @@ spec:
|
|||
- name: vol
|
||||
containers:
|
||||
- name: pv-recycler
|
||||
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
|
||||
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
|
||||
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.4
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
endif
|
||||
ifeq ($(ARCH),s390x)
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
|
||||
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
|
||||
endif
|
||||
|
||||
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
|
|||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "pv-recycler",
|
||||
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.4",
|
||||
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.6",
|
||||
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.4
|
||||
BASE_IMAGE_VERSION?=bookworm-v1.0.6
|
||||
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.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
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.6
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
|
||||
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.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
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.6
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
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/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.6
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
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
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.6
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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
|
||||
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.6
|
||||
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.6
|
||||
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.6
|
||||
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.6
|
||||
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.6
|
||||
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
|
||||
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
|
||||
|
|
|
|||
Loading…
Reference in a new issue