Enable k8s and/or filesrver in config

clusters/fs0/default.nix

@@ -1,12 +1,12 @@
 with import <nixpkgs> {};
 let
-  setup = import ../../lib/default.nix { inherit pkgs cfg lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cluster lib config; };
 
   hosts = [
     { name = "fs0-0"; address = "10.253.18.106"; hw = ./fs0-0.nix; }
   ];
 
-  cfg = {
+  cluster = {
     initca = ./ca;
     clusterName = "fs0";
     extraHosts = ''
@@ -35,10 +35,13 @@ let
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
 
-    fs.nfs.enable = true;
+    fs = {
-    fs.nfs.exports = ''
+      enable = true;
-      /vol/brick0/nfs0 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
+      nfs.enable = true;
-    '';
+      nfs.exports = ''
+        /vol/brick0/nfs0 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
+      '';
+    };
   };
 in
   setup.fs.mkDeployment hosts

clusters/fs2/default.nix

@@ -35,10 +35,13 @@ let
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
 
-    fs.nfs.enable = true;
+    fs = {
-    fs.nfs.exports = ''
+      enable = true;
+      nfs.enable = true;
+      nfs.exports = ''
        /vol/k2 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
-    '';
+      '';
+    };
   };
 in
   setup.fs.mkDeployment hosts

clusters/k0/default.nix

@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
 
   hosts = [
     { name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; }
@@ -11,7 +11,7 @@ let
     boot.bios = true;
   };
 
-  cfg = {
+  cluster = {
     clusterName = "k0";
     initca = ./ca;
 
@@ -43,33 +43,36 @@ let
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
 
-    k8s.master = {
+    k8s = {
-      name = "k0-0";
+      enable = true;
-      address = "10.253.18.100";
+      master = {
-      extraSANs = [ "k0.itpartner.no" ];
+        name = "k0-0";
-      hw = ./k0-0.nix;
+        address = "10.253.18.100";
-    };
+        extraSANs = [ "k0.itpartner.no" ];
-    k8s.nodes = hosts;
+        hw = ./k0-0.nix;
-    k8s.cidr = "10.11.0.0/16";
+      };
-    k8s.fileserver = "fs0-0";
+      nodes = hosts;
-    k8s.bootstrap = {
+      cidr = "10.11.0.0/16";
-      acme_email = "innovasjon@itpartner.no";
+      fileserver = "fs0-0";
-      grafana_smtp_user = "utvikling";
+      bootstrap = {
-      grafana_smtp_password = "S0m3rp0m@de#21!";
+        acme_email = "innovasjon@itpartner.no";
-      grafana_ldap_toml = ''
+        grafana_smtp_user = "utvikling";
-        verbose_logging = true
+        grafana_smtp_password = "S0m3rp0m@de#21!";
-        [[servers]]
+        grafana_ldap_toml = ''
-        host = "itp-dc1.itpartner.intern"
+          verbose_logging = true
-        port = 636
+          [[servers]]
-        use_ssl = true
+          host = "itp-dc1.itpartner.intern"
-        start_tls = false
+          port = 636
-        ssl_skip_verify = true
+          use_ssl = true
-        bind_dn = "gitlab@itpartner.intern"
+          start_tls = false
-        bind_password = "hipp hopp snipp snopp"
+          ssl_skip_verify = true
-        search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          bind_dn = "gitlab@itpartner.intern"
-        search_base_dns = ["DC=itpartner,DC=intern"]
+          bind_password = "hipp hopp snipp snopp"
-      '';
+          search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          search_base_dns = ["DC=itpartner,DC=intern"]
+        '';
+      };
     };
   };
 in
-  setup.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cluster.k8s.master hosts

clusters/k1/default.nix

@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
 
   hosts = [
     { name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; }
@@ -13,7 +13,7 @@ let
     boot.bios = true;
   };
 
-  cfg = {
+  cluster = {
     clusterName = "k2";
     initca = ./ca;
 
@@ -45,33 +45,36 @@ let
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
 
-    k8s.master = {
+    k8s = {
-      name = "k1-0";
+      enable = true;
-      address = "10.253.18.109";
+      master = {
-      extraSANs = [ "k1.itpartner.no" ];
+        name = "k1-0";
-      hw = ./k1-0.nix;
+        address = "10.253.18.109";
-    };
+        extraSANs = [ "k1.itpartner.no" ];
-    k8s.nodes = hosts;
+        hw = ./k1-0.nix;
-    k8s.cidr = "10.11.0.0/16";
+      };
-    k8s.fileserver = "fs0-0";
+      nodes = hosts;
-    k8s.bootstrap = {
+      cidr = "10.11.0.0/16";
-      acme_email = "innovasjon@itpartner.no";
+      fileserver = "fs0-0";
-      grafana_smtp_user = "utvikling";
+      bootstrap = {
-      grafana_smtp_password = "S0m3rp0m@de#21!";
+        acme_email = "innovasjon@itpartner.no";
-      grafana_ldap_toml = ''
+        grafana_smtp_user = "utvikling";
-        verbose_logging = true
+        grafana_smtp_password = "S0m3rp0m@de#21!";
-        [[servers]]
+        grafana_ldap_toml = ''
-        host = "itp-dc1.itpartner.intern"
+          verbose_logging = true
-        port = 636
+          [[servers]]
-        use_ssl = true
+          host = "itp-dc1.itpartner.intern"
-        start_tls = false
+          port = 636
-        ssl_skip_verify = true
+          use_ssl = true
-        bind_dn = "gitlab@itpartner.intern"
+          start_tls = false
-        bind_password = "hipp hopp snipp snopp"
+          ssl_skip_verify = true
-        search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          bind_dn = "gitlab@itpartner.intern"
-        search_base_dns = ["DC=itpartner,DC=intern"]
+          bind_password = "hipp hopp snipp snopp"
-      '';
+          search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          search_base_dns = ["DC=itpartner,DC=intern"]
+        '';
+      };
     };
   };
 in
-  setup.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cluster.k8s.master hosts

clusters/k2/default.nix

@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
 
   hosts = [
     { name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
@@ -14,7 +14,7 @@ let
     boot.bios = true;
   };
 
-  cfg = {
+  cluster = {
     clusterName = "k2";
     initca = ./ca;
 
@@ -46,33 +46,36 @@ let
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
 
-    k8s.master = {
+    k8s = {
-      name = "k2-0";
+      enable = true;
-      address = "10.253.18.114";
+      master = {
-      extraSANs = [ "k2.itpartner.no" ];
+        name = "k2-0";
-      hw = ./k2-0.nix;
+        address = "10.253.18.114";
-    };
+        extraSANs = [ "k2.itpartner.no" ];
-    k8s.nodes = hosts;
+        hw = ./k2-0.nix;
-    k8s.cidr = "10.11.0.0/16";
+      };
-    k8s.fileserver = "fs0-0";
+      nodes = hosts;
-    k8s.bootstrap = {
+      cidr = "10.11.0.0/16";
-      acme_email = "innovasjon@itpartner.no";
+      fileserver = "fs0-0";
-      grafana_smtp_user = "utvikling";
+      bootstrap = {
-      grafana_smtp_password = "S0m3rp0m@de#21!";
+        acme_email = "innovasjon@itpartner.no";
-      grafana_ldap_toml = ''
+        grafana_smtp_user = "utvikling";
-        verbose_logging = true
+        grafana_smtp_password = "S0m3rp0m@de#21!";
-        [[servers]]
+        grafana_ldap_toml = ''
-        host = "itp-dc1.itpartner.intern"
+          verbose_logging = true
-        port = 636
+          [[servers]]
-        use_ssl = true
+          host = "itp-dc1.itpartner.intern"
-        start_tls = false
+          port = 636
-        ssl_skip_verify = true
+          use_ssl = true
-        bind_dn = "gitlab@itpartner.intern"
+          start_tls = false
-        bind_password = "hipp hopp snipp snopp"
+          ssl_skip_verify = true
-        search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          bind_dn = "gitlab@itpartner.intern"
-        search_base_dns = ["DC=itpartner,DC=intern"]
+          bind_password = "hipp hopp snipp snopp"
-      '';
+          search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
+          search_base_dns = ["DC=itpartner,DC=intern"]
+        '';
+      };
     };
   };
 in
-  setup.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cluster.k8s.master hosts