github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119393 from saschagrunert/debian-base

Browse Source 
Update debian-base for test images and others
This commit is contained in:
Kubernetes Prow Robot 2023-09-19 00:48:55 -07:00 committed by GitHub
commit 12dc19d46f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/dependencies.yaml
View File

@ -158,6 +158,22 @@ dependencies:
match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-s390x:[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-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-s390x:[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-]+)*))?)
- path: test/conformance/image/Makefile - path: test/conformance/image/Makefile
match: BASE_IMAGE_VERSION\?= match: BASE_IMAGE_VERSION\?=
- path: test/images/pets/peer-finder/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: test/images/resource-consumer/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: test/images/pets/zookeeper-installer/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: test/images/nonroot/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: test/images/regression-issue-74839/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: test/images/pets/redis-installer/BASEIMAGE
match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?)
- path: cluster/gce/gci/configure-helper.sh
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-]+)*))?)
- path: pkg/volume/plugins.go
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" - name: "registry.k8s.io/distroless-iptables: dependents"
version: v0.3.2 version: v0.3.2

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

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

2
pkg/volume/plugins.go
View File

@ -1057,7 +1057,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "pv-recycler", Name: "pv-recycler",
Image: "registry.k8s.io/debian-base:v2.0.0", Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.0",
Command: []string{"/bin/sh"}, Command: []string{"/bin/sh"},
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"}, Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
VolumeMounts: []v1.VolumeMount{ VolumeMounts: []v1.VolumeMount{

10
test/images/nonroot/BASEIMAGE
View File

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

2
test/images/nonroot/VERSION
View File

@ -1 +1 @@
1.4 1.5

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

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

2
test/images/pets/peer-finder/VERSION
View File

@ -1 +1 @@
1.6 1.7

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

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

2
test/images/pets/redis-installer/VERSION
View File

@ -1 +1 @@
1.5 1.6

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

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

2
test/images/pets/zookeeper-installer/VERSION
View File

@ -1 +1 @@
1.5 1.6

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

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

2
test/images/regression-issue-74839/VERSION
View File

@ -1 +1 @@
1.2 1.3

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

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

2
test/images/resource-consumer/VERSION
View File

@ -1 +1 @@
1.13 1.14