kubernetes: patch broken go version check

fixes #35403
patch from https://github.com/kubernetes/kubernetes/pull/58207
already merged upstream - remove for next version

xeji b54e5b90 b492e2a1

+16
+5
pkgs/applications/networking/cluster/kubernetes/default.nix
··· 29 30 outputs = ["out" "man" "pause"]; 31 32 postPatch = '' 33 substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" 34 substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
··· 29 30 outputs = ["out" "man" "pause"]; 31 32 + # patch broken go version check, see issue #35403 33 + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 34 + #TODO: patch already merged upstream - remove for next k8s version 35 + patches = [ ./go-version-check.patch ]; 36 + 37 postPatch = '' 38 substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" 39 substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
+11
pkgs/applications/networking/cluster/kubernetes/go-version-check.patch
···
··· 1 + --- a/hack/lib/golang.sh 2 + +++ b/hack/lib/golang.sh 3 + @@ -323,7 +323,7 @@ EOF 4 + go_version=($(go version)) 5 + local minimum_go_version 6 + minimum_go_version=go1.9.1 7 + - if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then 8 + + 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 9 + kube::log::usage_from_stdin <<EOF 10 + Detected go version: ${go_version[*]}. 11 + Kubernetes requires ${minimum_go_version} or greater.