mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #129965 from cpanato/update-go-rel131
[release-1.31][go] Bump images, dependencies and versions to go 1.22.11 and distroless iptables
This commit is contained in:
commit
f5fd936df4
@ -1 +1 @@
|
||||
1.22.10
|
||||
1.22.11
|
@ -1 +1 @@
|
||||
v1.31.0-go1.22.10-bullseye.0
|
||||
v1.31.0-go1.22.11-bullseye.0
|
||||
|
@ -97,8 +97,8 @@ 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.5.11
|
||||
readonly __default_go_runner_version=v2.4.0-go1.22.10-bookworm.0
|
||||
readonly __default_distroless_iptables_version=v0.5.12
|
||||
readonly __default_go_runner_version=v2.4.0-go1.22.11-bookworm.0
|
||||
readonly __default_setcap_version=bookworm-v1.0.3
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
|
@ -116,7 +116,7 @@ dependencies:
|
||||
|
||||
# Golang
|
||||
- name: "golang: upstream version"
|
||||
version: 1.22.10
|
||||
version: 1.22.11
|
||||
refPaths:
|
||||
- path: .go-version
|
||||
- path: build/build-image/cross/VERSION
|
||||
@ -138,7 +138,7 @@ dependencies:
|
||||
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||
|
||||
- name: "registry.k8s.io/kube-cross: dependents"
|
||||
version: v1.31.0-go1.22.10-bullseye.0
|
||||
version: v1.31.0-go1.22.11-bullseye.0
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
|
||||
@ -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-]+)*))?)
|
||||
|
||||
- name: "registry.k8s.io/distroless-iptables: dependents"
|
||||
version: v0.5.11
|
||||
version: v0.5.12
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
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]+)"}
|
||||
|
||||
- name: "registry.k8s.io/go-runner: dependents"
|
||||
version: v2.4.0-go1.22.10-bookworm.0
|
||||
version: v2.4.0-go1.22.11-bookworm.0
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_go_runner_version=
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
|
||||
GOARM ?= 7
|
||||
DOCKER_CERT_BASE_PATH ?=
|
||||
QEMUVERSION=v5.1.0-2
|
||||
GOLANG_VERSION=1.22.10
|
||||
GOLANG_VERSION=1.22.11
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
@ -229,7 +229,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.5.11"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.12"}
|
||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"}
|
||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
||||
|
Loading…
Reference in New Issue
Block a user