pyrox.dev
kubernetes: use fetchpatch instead
+8
-5
pkgs/applications/networking/cluster/kubernetes/default.nix
+8
-5
pkgs/applications/networking/cluster/kubernetes/default.nix
···
1
-
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
1
+
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
2
2
, iptables, coreutils
3
3
, components ? [
4
4
"cmd/kubeadm"
···
29
29
30
30
outputs = ["out" "man" "pause"];
31
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 ];
32
+
patches = [
33
+
# patch is from https://github.com/kubernetes/kubernetes/pull/58207
34
+
(fetchpatch {
35
+
url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
36
+
sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
37
+
})
38
+
];
36
39
37
40
postPatch = ''
38
41
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
-11
pkgs/applications/networking/cluster/kubernetes/go-version-check.patch
-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.