github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

golang: Update to 1.18 from 1.18rc1

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2022-03-22 08:33:59 -04:00
parent 0b8a665d50
commit d8f1da5ecb
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
v1.24.0-go1.18rc1-bullseye.0 v1.24.0-go1.18-bullseye.0

2
build/common.sh
View File

@ -91,7 +91,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_debian_iptables_version=bullseye-v1.1.0 readonly __default_debian_iptables_version=bullseye-v1.1.0
readonly __default_go_runner_version=v2.3.1-go1.18rc1-bullseye.0 readonly __default_go_runner_version=v2.3.1-go1.18-bullseye.0
readonly __default_setcap_version=bullseye-v1.0.0 readonly __default_setcap_version=bullseye-v1.0.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

8
build/dependencies.yaml
View File

@ -80,7 +80,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.18rc1 version: 1.18
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: staging/publishing/rules.yaml - path: staging/publishing/rules.yaml
@ -97,7 +97,7 @@ dependencies:
version: 1.18 version: 1.18
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
# TODO(go118): Uncomment once ready to transition presubmits to go118 # TODO(dims): Uncomment once images are updated to go1.18
#- path: hack/lib/golang.sh #- path: hack/lib/golang.sh
# match: minimum_go_version=go([0-9]+\.[0-9]+) # match: minimum_go_version=go([0-9]+\.[0-9]+)
@ -108,7 +108,7 @@ dependencies:
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- name: "k8s.gcr.io/kube-cross: dependents" - name: "k8s.gcr.io/kube-cross: dependents"
version: v1.24.0-go1.18rc1-bullseye.0 version: v1.24.0-go1.18-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -138,7 +138,7 @@ dependencies:
match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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-]+)*))?)"} match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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: "k8s.gcr.io/go-runner: dependents" - name: "k8s.gcr.io/go-runner: dependents"
version: v2.3.1-go1.18rc1-bullseye.0 version: v2.3.1-go1.18-bullseye.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

@ -480,6 +480,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(dims): Need to switch this to 1.18 once we update images to newer go version
minimum_go_version=go1.17.0 minimum_go_version=go1.17.0
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

@ -7,7 +7,7 @@ recursive-delete-patterns:
- BUILD.bazel - BUILD.bazel
- "*/BUILD.bazel" - "*/BUILD.bazel"
- Gopkg.toml - Gopkg.toml
default-go-version: 1.18rc1 default-go-version: 1.18
rules: rules:
- destination: code-generator - destination: code-generator
branches: branches:

2
test/images/Makefile
View File

@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.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.18rc1 GOLANG_VERSION=1.18
export export
ifndef WHAT ifndef WHAT