diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-24 18:25:09 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-24 18:25:09 +0000 |
| commit | cb026a2bd22d2656d88a7883e44caa31402d7646 (patch) | |
| tree | 804c389adfe6dc6deb38dfd90167b03b4f828bce /nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix | |
| parent | 5781972383d0382dc9353ac720a5d751ca17cd05 (diff) | |
| parent | 650a295621b27c4ebe0fa64a63fd25323e64deb3 (diff) | |
| download | nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.gz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.bz2 nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.lz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.xz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.zst nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.zip | |
Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'
Diffstat (limited to 'nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix')
| -rw-r--r-- | nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix index 32eacad9025f..e68660e8bdd4 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix @@ -285,7 +285,7 @@ in }; }; - environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null) (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig); environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ |