diff options
Diffstat (limited to 'pkgs/applications/networking/cluster/kubernetes')
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/kubectl.nix | 29 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7adeed5ae126b..7a708c5e061d0 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.4"; + version = "1.23.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-6ivBecOttzbX85+WCttaU5nXjaiEiKU8xRhnCPkjLXg="; + sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; - maintainers = with maintainers; [ johanot offline saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.kubernetes.members; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix new file mode 100644 index 0000000000000..fec93d8878e05 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -0,0 +1,29 @@ +{ stdenv, kubernetes, installShellFiles }: + +stdenv.mkDerivation { + pname = "kubectl"; + version = kubernetes.version; + + # kubectl is currently part of the main distribution but will eventially be + # split out (see homepage) + dontUnpack = true; + + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + + installPhase = '' + install -D ${kubernetes}/bin/kubectl -t $out/bin + + installManPage "${kubernetes.man}/share/man/man1"/kubectl* + + installShellCompletion --cmd kubectl \ + --bash <($out/bin/kubectl completion bash) \ + --zsh <($out/bin/kubectl completion zsh) + ''; + + meta = kubernetes.meta // { + description = "Kubernetes CLI"; + homepage = "https://github.com/kubernetes/kubectl"; + }; +} |