diff options
| author | Daniel Schaefer <git@danielschaefer.me> | 2019-04-24 05:48:22 +0200 |
|---|---|---|
| committer | Daniel Schaefer <git@danielschaefer.me> | 2019-04-29 14:05:50 +0200 |
| commit | 786f02f7a45621b9f628f63649ff92546aff83b7 (patch) | |
| tree | 92784e131ccac4a1a63f7dbae6c228fb9d81468b /nixos/modules/services/cluster/kubernetes/kubelet.nix | |
| parent | 5f14e83bd6b9ef1c83b035011267dd3d40278476 (diff) | |
treewide: Remove usage of isNull
isNull "is deprecated; just write e == null instead" says the Nix manual
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/kubelet.nix')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2a4a0624555d..ccc8a16e788a 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -7,9 +7,9 @@ let cfg = top.kubelet; cniConfig = - if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + if cfg.cni.config != [] && cfg.cni.configDir != null then throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.cni.configDir) then + else if cfg.cni.configDir != null then cfg.cni.configDir else (pkgs.buildEnv { @@ -373,7 +373,7 @@ in boot.kernelModules = ["br_netfilter"]; services.kubernetes.kubelet.hostname = with config.networking; - mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + mkDefault (hostName + optionalString (domain != null) ".${domain}"); services.kubernetes.pki.certs = with top.lib; { kubelet = mkCert { |