Fix nasty attrset merge bug

2020-10-31 08:54:28 +01:00
parent 07de9bd42f
commit ec98ac483e
2 changed files with 38 additions and 39 deletions
--- a/lib/k8s.nix
+++ b/lib/k8s.nix
@@ -5,10 +5,10 @@ let

  pki = import ./pki.nix { inherit pkgs; ca = cfg.initca; };

-  apiserverAddress = "https://${masterAddress}:4443";
-
  masterAddress = cfg.k8s.master.address;

+  apiserverAddress = "https://${masterAddress}:4443";
+
  cfssl-apitoken =
    let
      apitoken = pkgs.stdenv.mkDerivation {
@@ -224,12 +224,12 @@ in {

      address = mkOption {
        type = types.str;
-        default = "127.0.0.1";
+        default = null;
      };

      name = mkOption {
        type = types.str;
-        default = "apiserver";
+        default = null;
      };

      extraSANs = mkOption {