mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Merge pull request #122705 from cpanato/update-go-1.21-master
[go] Bump images, dependencies and versions to go 1.21.6 and distroless iptables to 0.4.4
This commit is contained in:
commit
773ad73b90
@ -1 +1 @@
|
||||
1.21.5
|
||||
1.21.6
|
@ -1 +1 @@
|
||||
v1.29.0-go1.21.5-bullseye.0
|
||||
v1.30.0-go1.21.6-bullseye.0
|
||||
|
@ -96,8 +96,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.4.3
|
||||
readonly __default_go_runner_version=v2.3.1-go1.21.5-bookworm.0
|
||||
readonly __default_distroless_iptables_version=v0.4.4
|
||||
readonly __default_go_runner_version=v2.3.1-go1.21.6-bookworm.0
|
||||
readonly __default_setcap_version=bookworm-v1.0.0
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
|
@ -118,7 +118,7 @@ dependencies:
|
||||
|
||||
# Golang
|
||||
- name: "golang: upstream version"
|
||||
version: 1.21.5
|
||||
version: 1.21.6
|
||||
refPaths:
|
||||
- path: .go-version
|
||||
- path: build/build-image/cross/VERSION
|
||||
@ -140,7 +140,7 @@ dependencies:
|
||||
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||
|
||||
- name: "registry.k8s.io/kube-cross: dependents"
|
||||
version: v1.29.0-go1.21.5-bullseye.0
|
||||
version: v1.30.0-go1.21.6-bullseye.0
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
|
||||
@ -178,7 +178,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.3
|
||||
version: v0.4.4
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_distroless_iptables_version=
|
||||
@ -186,7 +186,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.3.1-go1.21.5-bookworm.0
|
||||
version: v2.3.1-go1.21.6-bookworm.0
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_go_runner_version=
|
||||
|
@ -2392,4 +2392,4 @@ rules:
|
||||
- staging/src/k8s.io/endpointslice
|
||||
recursive-delete-patterns:
|
||||
- '*/.gitattributes'
|
||||
default-go-version: 1.21.5
|
||||
default-go-version: 1.21.6
|
||||
|
@ -2,7 +2,7 @@ gcr.io/authenticated-image-pulling/alpine:3.7
|
||||
gcr.io/authenticated-image-pulling/windows-nanoserver:v1
|
||||
gcr.io/k8s-authenticated-test/agnhost:2.6
|
||||
invalid.registry.k8s.io/invalid/alpine:3.1
|
||||
registry.k8s.io/build-image/distroless-iptables:v0.4.3
|
||||
registry.k8s.io/build-image/distroless-iptables:v0.4.4
|
||||
registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2
|
||||
registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0
|
||||
registry.k8s.io/e2e-test-images/agnhost:2.45
|
||||
|
@ -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.21.5
|
||||
GOLANG_VERSION=1.21.6
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
@ -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.3"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.4"}
|
||||
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"}
|
||||
|
Loading…
Reference in New Issue
Block a user