diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-02-16 10:05:14 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-02-25 19:22:30 +1000 |
| commit | ec2028eb3ca59679b829f801524e73223021cb3e (patch) | |
| tree | f58a0105106c9e250b27f141ce1b54e4304feec4 | |
| parent | 43cc6e32463c38871dfe4d394f7ee1a2beaa1ebc (diff) | |
| download | nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar.gz nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar.bz2 nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar.lz nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar.xz nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.tar.zst nixpkgs-ec2028eb3ca59679b829f801524e73223021cb3e.zip | |
nixos/kubernetes: use kubectl from kubernetes
- also clarify kubectl wrapper naming
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/pki.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/kubernetes/base.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/kubernetes/rbac.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 88bde4e9155..7d9198d20e8 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -266,7 +266,7 @@ in in '' export KUBECONFIG=${clusterAdminKubeconfig} - ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} ''; })]); diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index f0c72084be5..d4410beb937 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -18,7 +18,7 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; - kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" ''; @@ -48,7 +48,7 @@ let }; }; programs.bash.enableCompletion = true; - environment.systemPackages = [ kubectl ]; + environment.systemPackages = [ wrapKubectl ]; services.flannel.iface = "eth1"; services.kubernetes = { proxy.hostname = "${masterName}.${domain}"; diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index ca73562256e..9e73fbbd32a 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -76,7 +76,7 @@ let }]; }); - kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } '' + copyKubectl = pkgs.runCommand "copy-kubectl" { } '' mkdir -p $out/bin cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl ''; @@ -84,7 +84,7 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ kubectl pkgs.busybox kubectlPod2 ]; + contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; config.Entrypoint = ["/bin/sh"]; }; |