diff options
| author | xeji <xeji@cat3.de> | 2018-02-23 22:56:36 +0100 |
|---|---|---|
| committer | xeji <xeji@cat3.de> | 2018-02-23 22:56:36 +0100 |
| commit | b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952 (patch) | |
| tree | cde6d405cfe4c30b877fa64e3931dfc9db843825 /pkgs/applications/networking | |
| parent | b492e2a16486b44ab1ee71049287f37d814c3fbd (diff) | |
| download | nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar.gz nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar.bz2 nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar.lz nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar.xz nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.tar.zst nixlib-b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952.zip | |
kubernetes: patch broken go version check
fixes #35403 patch from https://github.com/kubernetes/kubernetes/pull/58207 already merged upstream - remove for next version
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/go-version-check.patch | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e2f431e2a5e5..341abf98739d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; + # patch broken go version check, see issue #35403 + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + #TODO: patch already merged upstream - remove for next k8s version + patches = [ ./go-version-check.patch ]; + postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" diff --git a/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch b/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch new file mode 100644 index 000000000000..e3040cbb70ff --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch @@ -0,0 +1,11 @@ +--- a/hack/lib/golang.sh ++++ b/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. |