github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

[go] Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base

Browse Source 
Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
cpanato 2024-06-06 18:13:03 +02:00
parent c8a51aaffc
commit a3b193c6e9
Failed to extract signature
17 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.22.3 1.22.4

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.31.0-go1.22.3-bullseye.0 v1.31.0-go1.22.4-bullseye.0

6
build/common.sh
View File

@ -97,9 +97,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730 readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images. # These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.5.4 readonly __default_distroless_iptables_version=v0.5.5
readonly __default_go_runner_version=v2.3.1-go1.22.3-bookworm.0 readonly __default_go_runner_version=v2.3.1-go1.22.4-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.2 readonly __default_setcap_version=bookworm-v1.0.3
# These are the base images for the Docker-wrapped binaries. # 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}" readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"

12
build/dependencies.yaml
View File

@ -116,7 +116,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.22.3 version: 1.22.4
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -138,13 +138,13 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+) match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "registry.k8s.io/kube-cross: dependents" - name: "registry.k8s.io/kube-cross: dependents"
version: v1.31.0-go1.22.3-bullseye.0 version: v1.31.0-go1.22.4-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
# Base images # Base images
- name: "registry.k8s.io/debian-base: dependents" - name: "registry.k8s.io/debian-base: dependents"
version: bookworm-v1.0.2 version: bookworm-v1.0.3
refPaths: refPaths:
- path: cluster/images/etcd/Makefile - 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-]+)*))?) 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-]+)*))?)
@ -176,7 +176,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-]+)*))?) 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.5.4 version: v0.5.5
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_distroless_iptables_version= match: __default_distroless_iptables_version=
@ -184,7 +184,7 @@ dependencies:
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"} match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
- name: "registry.k8s.io/go-runner: dependents" - name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.22.3-bookworm.0 version: v2.3.1-go1.22.4-bookworm.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=
@ -244,7 +244,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "registry.k8s.io/build-image/setcap: dependents" - name: "registry.k8s.io/build-image/setcap: dependents"
version: bookworm-v1.0.2 version: bookworm-v1.0.3
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_setcap_version= match: __default_setcap_version=

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

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

10
cluster/images/etcd/Makefile
View File

@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}} DOCKERFILE := ${DOCKERFILE.${OS}}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
endif endif
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
endif endif
BASE.windows = mcr.microsoft.com/windows/nanoserver BASE.windows = mcr.microsoft.com/windows/nanoserver

2
pkg/volume/plugins.go
View File

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

2
staging/publishing/rules.yaml
View File

@ -2873,4 +2873,4 @@ rules:
- staging/src/k8s.io/endpointslice - staging/src/k8s.io/endpointslice
recursive-delete-patterns: recursive-delete-patterns:
- '*/.gitattributes' - '*/.gitattributes'
default-go-version: 1.22.3 default-go-version: 1.22.4

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 # This is defined in root Makefile, but some build contexts do not refer to them
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
BASE_IMAGE_VERSION?=bookworm-v1.0.2 BASE_IMAGE_VERSION?=bookworm-v1.0.3
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX) TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)

2
test/images/Makefile
View File

@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7 GOARM ?= 7
DOCKER_CERT_BASE_PATH ?= DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2 QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.22.3 GOLANG_VERSION=1.22.4
export export
ifndef WHAT ifndef WHAT

10
test/images/nonroot/BASEIMAGE
View File

@ -1,7 +1,7 @@
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 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.2 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.2 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.2 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.2 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
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

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.2 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.2 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.2 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.2 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.2 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3

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.2 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.2 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.2 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.2 linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3

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.2 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.2 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.2 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.2 linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3

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.2 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.2 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.2 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.2 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.2 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3

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.2 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.2 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.2 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.2 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.2 linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
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/utils/image/manifest.go
View File

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