github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122889 from cpanato/update-go-122

Browse Source 
[go] Bump images, dependencies and versions to go 1.22rc2
This commit is contained in:
Kubernetes Prow Robot
2024-01-29 14:13:31 -08:00
committed by GitHub
parent 0209c546fd ee86ca9f13
commit 0ff6a00faf
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@@ -1 +1 @@
1.21.6 1.22rc2

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

@@ -1 +1 @@
v1.30.0-go1.21.6-bullseye.0 v1.30.0-go1.22rc2-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.22rc2-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.

24
build/dependencies.yaml
View File

@@ -118,12 +118,13 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.21.6 version: 1.22rc2
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: staging/publishing/rules.yaml # TODO: remove this when whe have the go1.22 released and not the rc.
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' # - path: staging/publishing/rules.yaml
# match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- path: test/images/Makefile - path: test/images/Makefile
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
@@ -132,15 +133,16 @@ dependencies:
# #
# This entry is a stub of the major version to allow dependency checks to # This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang. # pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>" # TODO: remove this when whe have the go1.22 released and not the rc.
version: 1.21 # - name: "golang: 1.<major>"
refPaths: # version: 1.22
- path: build/build-image/cross/VERSION # refPaths:
- path: hack/lib/golang.sh # - path: build/build-image/cross/VERSION
match: minimum_go_version=go([0-9]+\.[0-9]+) # - path: hack/lib/golang.sh
# 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.30.0-go1.21.6-bullseye.0 version: v1.30.0-go1.22rc2-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@@ -186,7 +188,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.21.6-bookworm.0 version: v2.3.1-go1.22rc2-bookworm.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

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
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.22rc2
export export
ifndef WHAT ifndef WHAT