kubernetes: rebuild with go-1.10

- Use upstream fix for kubernetes.
This commit is contained in:
Andrew Benson 2018-02-22 22:55:52 -05:00 committed by Michael Gehring
parent f573b89a6d
commit 1e4427a9e7
2 changed files with 12 additions and 1 deletions

View file

@ -0,0 +1,11 @@
--- hack/lib/golang.sh
+++ hack/lib/golang.sh
@@ -323,7 +323,7 @@ EOF
go_version=($(go version))
local minimum_go_version
minimum_go_version=go1.9.1
- if [[ "${go_version[2]}" < "${minimum_go_version}" && "${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
Detected go version: ${go_version[*]}.
Kubernetes requires ${minimum_go_version} or greater.

View file

@ -1,7 +1,7 @@
# Template file for 'kubernetes'
pkgname=kubernetes
version=1.9.3
revision=1
revision=2
build_style=go
nocross=yes
only_for_archs="x86_64 x86_64-musl"