github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123170 from cpanato/update-distroless

Browse Source 
update distroless-iptables to v0.5.0 debian-base to bookworm-v1.0.1 and setcap to bookworm-v1.0.1
This commit is contained in:
Kubernetes Prow Robot
2024-02-07 03:57:07 -08:00
committed by GitHub
parent 052bce26f4 ac9482d15f
commit d6e4c6cdea
13 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@@ -96,9 +96,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.4.4
readonly __default_distroless_iptables_version=v0.5.0
readonly __default_go_runner_version=v2.3.1-go1.22rc2-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.0
readonly __default_setcap_version=bookworm-v1.0.1
# 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}"

6
build/dependencies.yaml
View File

@@ -148,7 +148,7 @@ dependencies:
# Base images
- name: "registry.k8s.io/debian-base: dependents"
version: bookworm-v1.0.0
version: bookworm-v1.0.1
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-]+)*))?)
@@ -180,7 +180,7 @@ dependencies:
match: 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-]+)*))?)
- name: "registry.k8s.io/distroless-iptables: dependents"
version: v0.4.4
version: v0.5.0
refPaths:
- path: build/common.sh
match: __default_distroless_iptables_version=
@@ -256,7 +256,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "registry.k8s.io/build-image/setcap: dependents"
version: bookworm-v1.0.0
version: bookworm-v1.0.1
refPaths:
- path: build/common.sh
match: __default_setcap_version=

2
cluster/gce/gci/configure-helper.sh
View File

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

10
cluster/images/etcd/Makefile
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.0
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.1
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.1
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.1
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.1
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.1
endif
BASE.windows = mcr.microsoft.com/windows/nanoserver

2
pkg/volume/plugins.go
View File

@@ -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.0",
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.1",
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{

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

10
test/images/nonroot/BASEIMAGE
View File

@@ -1,7 +1,7 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
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
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

10
test/images/pets/peer-finder/BASEIMAGE
View File

@@ -1,5 +1,5 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
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

8
test/images/pets/redis-installer/BASEIMAGE
View File

@@ -1,4 +1,4 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
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

8
test/images/pets/zookeeper-installer/BASEIMAGE
View File

@@ -1,4 +1,4 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
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

10
test/images/regression-issue-74839/BASEIMAGE
View File

@@ -1,5 +1,5 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
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

10
test/images/resource-consumer/BASEIMAGE
View File

@@ -1,7 +1,7 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
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
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

2
test/utils/image/manifest.go
View File

@@ -237,7 +237,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.4"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.0"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.11-0"}
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}