diff options
| author | Yurii Matsiuk <ymatsiuk@users.noreply.github.com> | 2021-01-13 20:10:04 +0100 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-03-07 12:50:39 +1000 |
| commit | 7da62867be079bb5f6412fb12a76dbb68f9bad4b (patch) | |
| tree | 5165d62928ea72c15ccaef05b1eddeb80c6e1814 /pkgs/applications/networking/cluster/kubernetes/default.nix | |
| parent | fc750b2000a1cfb31cc4cf2a409f16f243d2f9c0 (diff) | |
| download | nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar.gz nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar.bz2 nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar.lz nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar.xz nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.tar.zst nixpkgs-7da62867be079bb5f6412fb12a76dbb68f9bad4b.zip | |
nixos/kubernetes: adapt module and test cases to fit kubernetes v1.20.X as well as coredns v1.7.X
Diffstat (limited to 'pkgs/applications/networking/cluster/kubernetes/default.nix')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 184f36c69f7..cb669615f63 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "pause" ]; + patches = [ ./fixup-addonmanager-lib-path.patch ]; + postPatch = '' # go env breaks the sandbox substituteInPlace "hack/lib/golang.sh" \ @@ -64,10 +66,17 @@ stdenv.mkDerivation rec { install -D build/pause/linux/pause -t $pause/bin installManPage docs/man/man1/*.[1-9] - cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons + # Unfortunately, kube-addons-main.sh only looks for the lib file in either the current working dir + # or in /opt. We have to patch this for now. + substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \ + --subst-var out + + chmod +x $out/bin/kube-addons patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" + cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh + cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh for tool in kubeadm kubectl; do |