Merge pull request kubernetes#123170 from cpanato/update-distroless

k8s-ci-robot · web-flow · commit d6e4c6cdea48 · 2024-02-07T03:57:07.000-08:00
update distroless-iptables to v0.5.0 debian-base to bookworm-v1.0.1 and setcap to bookworm-v1.0.1
diff --git a/build/common.sh b/build/common.sh
@@ -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}"
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -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=
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
@@ -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:
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
@@ -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
diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go
@@ -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{
diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile
@@ -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)
diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE
@@ -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
diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE
@@ -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
diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE
@@ -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
diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE
@@ -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
diff --git a/test/images/regression-issue-74839/BASEIMAGE b/test/images/regression-issue-74839/BASEIMAGE
@@ -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
diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE
@@ -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
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
@@ -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"}

Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {`
`1064`	`1064`	`Containers: []v1.Container{`
`1065`	`1065`	`{`
`1066`	`1066`	`Name: "pv-recycler",`
`1067`		`- Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.0",`
	`1067`	`+ Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.1",`
`1068`	`1068`	`Command: []string{"/bin/sh"},`
`1069`	`1069`	`Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" \|\| exit 1"},`
`1070`	`1070`	`VolumeMounts: []v1.VolumeMount{`