Merge pull request #114502 from cpanato/go1.20

[go] Bump images, dependencies and versions to go 1.20
This commit is contained in:
Kubernetes Prow Robot 2023-02-04 13:40:28 -08:00 committed by GitHub
commit cf14b50b0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 11 deletions

View File

@ -1 +1 @@
1.19.5 1.20

View File

@ -1 +1 @@
v1.26.0-go1.19.5-bullseye.0 v1.27.0-go1.20-bullseye.0

View File

@ -96,7 +96,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.1.2 readonly __default_distroless_iptables_version=v0.1.2
readonly __default_go_runner_version=v2.3.1-go1.19.5-bullseye.0 readonly __default_go_runner_version=v2.3.1-go1.20-bullseye.0
readonly __default_setcap_version=bullseye-v1.3.0 readonly __default_setcap_version=bullseye-v1.3.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

View File

@ -95,7 +95,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.19.5 version: 1.20
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -110,14 +110,15 @@ 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>" - name: "golang: 1.<major>"
version: 1.19 version: 1.20
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: hack/lib/golang.sh # TODO(cpanato): Need to switch this to 1.20 once we update images to newer go 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.26.0-go1.19.5-bullseye.0 version: v1.27.0-go1.20-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -147,7 +148,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.19.5-bullseye.0 version: v2.3.1-go1.20-bullseye.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

View File

@ -490,6 +490,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(cpanato): Need to switch this to 1.20 once we update images to newer go version
minimum_go_version=go1.19 minimum_go_version=go1.19
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

View File

@ -2062,4 +2062,4 @@ rules:
library: true library: true
recursive-delete-patterns: recursive-delete-patterns:
- '*/.gitattributes' - '*/.gitattributes'
default-go-version: 1.19.5 default-go-version: 1.20

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.19.5 GOLANG_VERSION=1.20
export export
ifndef WHAT ifndef WHAT