git.iko.soy/typeable/nixpkgs
on master help sign in
kubernetes: misc fixes

- don't install unnecessary binaries - remove go-bindata, already vendored by upstream - use installShellFiles, add kubeadm completion - require kubeadm/kubectl so installPhase can't be broken

commit563ff4adf9b0c25453d4b6448da14524eb91458e authorzowoq <59103226+zowoq@users.noreply.github.com> dateWed 2 Dec 2020, 07:06 (6 years ago) parenta35e7da
1 file changed+28−16
pkgs/applications/networking/cluster/kubernetes/default.nix+28−16
pkgs/applications/networking/cluster/kubernetes/default.nix+28−16
@@ -1,7 +1,14 @@
1−{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, removeReferencesTo
5+, which
6+, go
7+, makeWrapper
8+, rsync
9+, installShellFiles
10+
211, components ? [
3− "cmd/kubeadm"
4− "cmd/kubectl"
512 "cmd/kubelet"
613 "cmd/kube-apiserver"
714 "cmd/kube-controller-manager"
@@ -11,8 +18,6 @@
1118 ]
1219}:
1320
14−with lib;
15−
1621stdenv.mkDerivation rec {
1722 pname = "kubernetes";
1823 version = "1.19.4";
@@ -24,9 +29,9 @@ stdenv.mkDerivation rec {
2429 sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi";
2530 };
2631
27− nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
32+ nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
2833
29− outputs = ["out" "man" "pause"];
34+ outputs = [ "out" "man" "pause" ];
3035
3136 postPatch = ''
3237 # go env breaks the sandbox
@@ -41,7 +46,10 @@ stdenv.mkDerivation rec {
4146 patchShebangs ./hack
4247 '';
4348
44− WHAT=concatStringsSep " " components;
49+ WHAT = lib.concatStringsSep " " ([
50+ "cmd/kubeadm"
51+ "cmd/kubectl"
52+ ] ++ components);
4553
4654 postBuild = ''
4755 ./hack/update-generated-docs.sh
@@ -49,11 +57,12 @@ stdenv.mkDerivation rec {
4957 '';
5058
5159 installPhase = ''
52− mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin"
60+ for p in $WHAT; do
61+ install -D _output/local/go/bin/''${p##*/} -t $out/bin
62+ done
5363
54− cp _output/local/go/bin/* "$out/bin/"
55− cp build/pause/pause "$pause/bin/pause"
56− cp -R docs/man/man1 "$man/share/man"
64+ install -D build/pause/pause -t $pause/bin
65+ installManPage docs/man/man1/*.[1-9]
5766
5867 cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
5968 patchShebangs $out/bin/kube-addons
@@ -61,19 +70,22 @@ stdenv.mkDerivation rec {
6170
6271 cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh
6372
64− $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
65− $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl
73+ for tool in kubeadm kubectl; do
74+ installShellCompletion --cmd $tool \
75+ --bash <($out/bin/$tool completion bash) \
76+ --zsh <($out/bin/$tool completion zsh)
77+ done
6678 '';
6779
6880 preFixup = ''
6981 find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
7082 '';
7183
72− meta = {
84+ meta = with lib; {
7385 description = "Production-Grade Container Scheduling and Management";
7486 license = licenses.asl20;
7587 homepage = "https://kubernetes.io";
76− maintainers = with maintainers; [johanot offline saschagrunert];
88+ maintainers = with maintainers; [ johanot offline saschagrunert ];
7789 platforms = platforms.unix;
7890 };
7991}