Merge pull request #99655 from liggitt/min-go-version

Update go version check to 1.16+
This commit is contained in:
Kubernetes Prow Robot 2021-03-03 20:13:59 -08:00 committed by GitHub
commit 9658145f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -120,6 +120,8 @@ dependencies:
version: 1.16 version: 1.16
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: hack/lib/golang.sh
match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "k8s.gcr.io/kube-cross: dependents" - name: "k8s.gcr.io/kube-cross: dependents"
version: v1.16.0-1 version: v1.16.0-1

View File

@ -480,7 +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
minimum_go_version=go1.15.0 minimum_go_version=go1.16.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
Detected go version: ${go_version[*]}. Detected go version: ${go_version[*]}.