github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[go] Bump images, dependencies and versions to go 1.22rc1

Browse Source 
Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
cpanato
2024-01-20 10:30:48 +01:00
parent c606448922
commit c9991e4270
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@@ -1 +1 @@
1.21.6 1.22rc1

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

@@ -1 +1 @@
v1.30.0-go1.21.6-bullseye.0 v1.30.0-go1.22rc1-bullseye.0

2
build/common.sh
View File

@@ -97,7 +97,7 @@ 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.4.4 readonly __default_distroless_iptables_version=v0.4.4
readonly __default_go_runner_version=v2.3.1-go1.21.6-bookworm.0 readonly __default_go_runner_version=v2.3.1-go1.22rc1-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.0 readonly __default_setcap_version=bookworm-v1.0.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

1
hack/lib/golang.sh
View File

@@ -497,6 +497,7 @@ EOF
local go_version local go_version
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
local minimum_go_version local minimum_go_version
# TODO: Update to go1.22 as soon we are ready to merge this
minimum_go_version=go1.21 minimum_go_version=go1.21
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
kube::log::usage_from_stdin <<EOF kube::log::usage_from_stdin <<EOF

2
staging/publishing/rules.yaml
View File

@@ -2392,4 +2392,4 @@ rules:
- staging/src/k8s.io/endpointslice - staging/src/k8s.io/endpointslice
recursive-delete-patterns: recursive-delete-patterns:
- '*/.gitattributes' - '*/.gitattributes'
default-go-version: 1.21.6 default-go-version: 1.22rc1

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.21.6 GOLANG_VERSION=1.22rc1
export export
ifndef WHAT ifndef WHAT