Update k8s clusters and fs servers

clusters/fs1/default.nix

@@ -10,7 +10,7 @@ let
   address = "10.1.30.10";
 in {
   fs1-0 = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "fs" ];
+    # deployment.tags = [ "fs" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
@@ -45,6 +45,7 @@ in {
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDULdlLC8ZLu9qBZUYsjhpr6kv5RH4yPkekXQdD7prkqapyoptUkO1nOTDwy7ZsKDxmp9Zc6OtdhgoJbowhGW3VIZPmooWO8twcaYDpkxEBLUehY/n8SlAwBtiHJ4mTLLcynJMVrjmTQLF3FeWVof0Aqy6UtZceFpLp1eNkiHTCM3anwtb9+gfr91dX1YsAOqxqv7ooRDu5rCRUvOi4OvRowepyuBcCjeWpTkJHkC9WGxuESvDV3CySWkGC2fF2LHkAu6SFsFE39UA5ZHo0b1TK+AFqRFiBAb7ULmtuno1yxhpBxbozf8+Yyc7yLfMNCyBpL1ci7WnjKkghQv7yM1xN2XMJLpF56v0slSKMoAs7ThoIlmkRm/6o3NCChgu0pkpNg/YP6A3HfYiEDgChvA6rAHX6+to50L9xF3ajqk4BUzWd/sCk7Q5Op2lzj31L53Ryg8vMP8hjDjYcgEcCCsGOcjUVgcsmfC9LupwRIEz3aF14AWg66+3zAxVho8ozjes= jonas.juselius@juselius.io"
           "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"
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC2tox0uyFGfU1zPNU6yAVSoGOUkeU959aiTMrqu1U9MCCOP2o4IhZIlRpZ08XVnUU/AhycCUF4HgGqdcco8oIVX0P0Cn83KJoD/DOqAiz+1VwIUUV1ylrRdNqCgf4wnmLni3sUPHJdQnuq57+pzDDjHMr9CcBL2KzOHD/QanfR+jZmv9K3OS5oDcWquSCziXkpbkWQURPactmtyzGK2FRRxONZgYrB8gRTDstlWQg/t6GHNVelzuJ7SEf+t8pk/S2e/XAvfZyRJhrVJ35iZKpmxkIn5v0g1Z+z0yX/KRSAPRtNg9uM44cmto77MFx7iFs0CuleL3zHvRvZYW1ZnsKAiP07UkEK87luMpkTzFr9CSHJGpgk1RZYA3qidQti44n6NU9YRNhzO4v+KQE6XDqO80gZCJboSXr3fnYn/QHpPXzK5JcZNWmClyMURYj10qv9So3Fh0o3LV5GThA6JgN874vUywUZanPEdn8ePBcAsjLRzA4YBGEuvJCc6FELSuY2s+/pFba8NXQvrOdJKSRC0g5USQFfaWDln4Q4zZ1G5z76p1u6GtRWxvakkUQ0fze9KAW7msxeKaw+B7uMtyvCL8V2zEE8WKFP1sNyYEe7Sgp3RVfym2VPMNTZVhEImfM/3D+WbzfoJztnJvFKXeeMCcne4G8swyef3o1s3b+CvQ== ski027@uit.no"
         ];
       };
 

clusters/fs2/default.nix

@@ -9,7 +9,7 @@ let
   address = "10.1.8.10";
 in {
   fs2-0 = { config, pkgs, ... }: with pkgs; {
-    deployment.tags = [ "fs" ];
+    # deployment.tags = [ "fs" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
@@ -39,6 +39,7 @@ in {
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDULdlLC8ZLu9qBZUYsjhpr6kv5RH4yPkekXQdD7prkqapyoptUkO1nOTDwy7ZsKDxmp9Zc6OtdhgoJbowhGW3VIZPmooWO8twcaYDpkxEBLUehY/n8SlAwBtiHJ4mTLLcynJMVrjmTQLF3FeWVof0Aqy6UtZceFpLp1eNkiHTCM3anwtb9+gfr91dX1YsAOqxqv7ooRDu5rCRUvOi4OvRowepyuBcCjeWpTkJHkC9WGxuESvDV3CySWkGC2fF2LHkAu6SFsFE39UA5ZHo0b1TK+AFqRFiBAb7ULmtuno1yxhpBxbozf8+Yyc7yLfMNCyBpL1ci7WnjKkghQv7yM1xN2XMJLpF56v0slSKMoAs7ThoIlmkRm/6o3NCChgu0pkpNg/YP6A3HfYiEDgChvA6rAHX6+to50L9xF3ajqk4BUzWd/sCk7Q5Op2lzj31L53Ryg8vMP8hjDjYcgEcCCsGOcjUVgcsmfC9LupwRIEz3aF14AWg66+3zAxVho8ozjes= jonas.juselius@juselius.io"
           "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"
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC2tox0uyFGfU1zPNU6yAVSoGOUkeU959aiTMrqu1U9MCCOP2o4IhZIlRpZ08XVnUU/AhycCUF4HgGqdcco8oIVX0P0Cn83KJoD/DOqAiz+1VwIUUV1ylrRdNqCgf4wnmLni3sUPHJdQnuq57+pzDDjHMr9CcBL2KzOHD/QanfR+jZmv9K3OS5oDcWquSCziXkpbkWQURPactmtyzGK2FRRxONZgYrB8gRTDstlWQg/t6GHNVelzuJ7SEf+t8pk/S2e/XAvfZyRJhrVJ35iZKpmxkIn5v0g1Z+z0yX/KRSAPRtNg9uM44cmto77MFx7iFs0CuleL3zHvRvZYW1ZnsKAiP07UkEK87luMpkTzFr9CSHJGpgk1RZYA3qidQti44n6NU9YRNhzO4v+KQE6XDqO80gZCJboSXr3fnYn/QHpPXzK5JcZNWmClyMURYj10qv9So3Fh0o3LV5GThA6JgN874vUywUZanPEdn8ePBcAsjLRzA4YBGEuvJCc6FELSuY2s+/pFba8NXQvrOdJKSRC0g5USQFfaWDln4Q4zZ1G5z76p1u6GtRWxvakkUQ0fze9KAW7msxeKaw+B7uMtyvCL8V2zEE8WKFP1sNyYEe7Sgp3RVfym2VPMNTZVhEImfM/3D+WbzfoJztnJvFKXeeMCcne4G8swyef3o1s3b+CvQ== ski027@uit.no"
         ];
       };
       fs = {

clusters/hosts.nix

@@ -21,4 +21,6 @@
   10.1.30.101 k1-1 k1-1.itpartner.intern
   10.1.30.102 k1-2 k1-2.itpartner.intern
   10.1.30.103 k1-3 k1-3.itpartner.intern
+  10.1.30.104 k1-4 k1-4.itpartner.intern
+  10.1.30.105 k1-5 k1-5.itpartner.intern
 ''

clusters/k0/default.nix

@@ -8,19 +8,25 @@ let
     k0-2 = "10.1.8.52";
   };
 
+  etcdCluster = {
+    enable = true;
+    existing = true;
+    nodes = etcdNodes;
+  };
+
   master = {
     features.k8s = {
       host.name = "k0-0";
       host.address = "10.1.8.50";
       master.enable = true;
       nodes = nodes;
-      etcdCluster = {
+      inherit etcdCluster;
-        enable = true;
+    };
-        existing = true;
+    services.kubernetes.kubelet.taints.unschedulable = {
-        nodes = etcdNodes;
+      key = "node.kubernetes.io/unschedulable";
-      };
+      value = "true";
+      effect = "NoSchedule";
     };
-    services.kubernetes.kubelet.unschedulable = true;
     imports = [ ./cluster.nix ./hw/k0-0.nix ];
   };
 
@@ -37,11 +43,7 @@ let
       }
       (if builtins.hasAttr x.name etcdNodes then
         {
-          features.k8s.etcdCluster = {
+          features.k8s = { inherit etcdCluster; };
-            enable = true;
-            existing = true;
-            nodes = etcdNodes;
-          };
         }
         else {})
       ]

clusters/k1/cluster.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, config, ... }:
 with lib;
 let
-  cfg = config.node;
+  cfg = config.features.k8s.host;
 
   mkSANs = host: [
     host.name
@@ -16,6 +16,11 @@ let
     boot = {
       loader.systemd-boot.enable = false;
       loader.efi.canTouchEfiVariables = true;
+      loader.grub = {
+        enable = true;
+        version = 2;
+        device = "/dev/sda";
+      };
     };
 
     console = {
@@ -41,6 +46,7 @@ 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"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmqQuK1c56lBhSjWIXDFaaL44rm61Q15RULEI1qFd+mqVNNsrQ4t+IEx8rh99SYF0C8oD4eJqO78H+XkRBFCP/d/VArtPOdCAl9fPPHXtT3KgPywwRccVG7qpOsKs4VZmVM/Hd5t7cfkaeF0v+CWrodVxqozHxLPwkQ0xVg4bVpo8+9OZ2Hy09F3yBJviDvxcWtevFeUUeFX4rdNVnX5ew2knmDXn6/EFuIHhTYIlYMlIXOdCejPrRqcgw0F1sJSzOX7u+bumeOHJ1LBaHnts2y9Sc5tDQ5mpbWG868WkRhElnhOYzlDpqUxlhJRfQnsFvyHGbmDetzOS9uJTZDrdCTScjmEGxWyMh/dY5e3SVe8pEsIY5lWjyxkavkBUWTdLsV4a1oQjnwbvGWJQI2rYYBjDw2N4RU3j388P6H2IjAhtTwtCX2V8Qji27Y4U3RRzzY+UWqAyEiPNVNLXmnPTivXtEHL4fqVmDjLRoGwrvQ77Ir2V9bdaJ8sYwCbaktyQ2rwYDU+4yjlnJo2Ftb4iTgrlVorIFn+Ovu3UvG6ygxVjKaoJ9ka3w8hMIb4EA3lw7DlIVd1elbMgsybLiiamf5aPPZ/W5EPQ53aAs1ef6OPkOWW+SdIgZBXYL3lFuDc/15vmnWyVomrOf7/sWTTUkxp1YfgaLi7+YcSMfz/ZBDQ== rjod@SWAMPTHING"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDEN59dUXFwoGL3reyVukqZA59fKJOCUZg19zndEqmnv39/Wi5JGS8uwSjetpwrmtwdwc4pq4fOeiAHtWm6oq7dNjMEvUqP2THehGXMr+fK4ElDgrA1NzUxvSXFhTmuQXGGNt7hl8Knsr5ySkLWrmcWkUn6z8rvefx++pTh3J7oDCYugTW/VGQaKYxHwQfZf1goppkQo8tJH5crJwgeaiTCn6645+rkVTYIzY4JVvXlvNuYWxwUaaeV7ztvdkHJc6WGCWQZGg9M3fYp52tC4HOlZ2aWRQ3PJuQ4wpNHGODwsZqB0yNgGnWZ9KH5+sOz0+3He5ZIPJo89HaqGCZi8wWNfhm+GHMDysxA2Ht+hvgBDccN9dDaSvXlUP1EtgFp8rG2baXEeHk3qMMJACxNuqVf4d8j/WIf0O5KswsiCLxdJFEcfDv573iA6rmM6R6oVvlAmO76K+sCD2T2Uy9WGlGIKdGtvC9dhbiB6d8clO4qDRzBPk6EUEFRFxwo4JkRx7XKpJkmbIl1gT22Btkwf5qjyPp025opaNFeEsP5s3LV0e+RY8VN0SpnOBdfyfwiXRDbunqRqZ662aBLGH0dAY1ocfUO1CdZerJ2ceLEY8ma/rC045arzwx4v+R538SnokyKzWsfwGWB7VzdwQZ2os/hLA6wmu9RPhuzmNFzjdrIsQ== remi@fork"
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC2tox0uyFGfU1zPNU6yAVSoGOUkeU959aiTMrqu1U9MCCOP2o4IhZIlRpZ08XVnUU/AhycCUF4HgGqdcco8oIVX0P0Cn83KJoD/DOqAiz+1VwIUUV1ylrRdNqCgf4wnmLni3sUPHJdQnuq57+pzDDjHMr9CcBL2KzOHD/QanfR+jZmv9K3OS5oDcWquSCziXkpbkWQURPactmtyzGK2FRRxONZgYrB8gRTDstlWQg/t6GHNVelzuJ7SEf+t8pk/S2e/XAvfZyRJhrVJ35iZKpmxkIn5v0g1Z+z0yX/KRSAPRtNg9uM44cmto77MFx7iFs0CuleL3zHvRvZYW1ZnsKAiP07UkEK87luMpkTzFr9CSHJGpgk1RZYA3qidQti44n6NU9YRNhzO4v+KQE6XDqO80gZCJboSXr3fnYn/QHpPXzK5JcZNWmClyMURYj10qv9So3Fh0o3LV5GThA6JgN874vUywUZanPEdn8ePBcAsjLRzA4YBGEuvJCc6FELSuY2s+/pFba8NXQvrOdJKSRC0g5USQFfaWDln4Q4zZ1G5z76p1u6GtRWxvakkUQ0fze9KAW7msxeKaw+B7uMtyvCL8V2zEE8WKFP1sNyYEe7Sgp3RVfym2VPMNTZVhEImfM/3D+WbzfoJztnJvFKXeeMCcne4G8swyef3o1s3b+CvQ== ski027@uit.no"
           ];
       };
 
@@ -92,19 +98,6 @@ let
 
   };
 in {
-  options.node = {
-    address = mkOption {
-      type = types.str;
-      default = null;
-    };
-
-    name = mkOption {
-      type = types.str;
-      default = null;
-    };
-
-  };
-
   config = configuration;
 
   imports = [

clusters/k1/default.nix

@@ -1,10 +1,36 @@
 with import <nixpkgs> {};
 let
+  etcdNodes = {
+    k1-0 = "10.1.30.100";
+    k1-1 = "10.1.30.101";
+    k1-2 = "10.1.30.102";
+  };
+
+  etcdCluster = {
+    enable = true;
+    existing = true;
+    nodes = etcdNodes;
+  };
+
   master = {
-    node.name = "k1-0";
+    features.k8s = {
-    node.address = "10.1.30.100";
+      host.name = "k1-0";
-    features.k8s.master.enable = true;
+      host.address = "10.1.30.100";
-    features.k8s.nodes = nodes;
+      master.enable = true;
+      nodes = nodes;
+      inherit etcdCluster;
+    };
+    fileSystems = {
+      "/vol/local-storage/vol1" = {
+        device = "/vol/vol1";
+        options = [ "bind" ];
+      };
+    };
+    services.kubernetes.kubelet.taints.unschedulable = {
+      key = "node.kubernetes.io/unschedulable";
+      value = "true";
+      effect = "NoSchedule";
+    };
     imports = [ ./cluster.nix ./hw/k1-0.nix ];
   };
 
@@ -12,18 +38,27 @@ let
     { name = "k1-1"; address = "10.1.30.101"; }
     { name = "k1-2"; address = "10.1.30.102"; }
     { name = "k1-3"; address = "10.1.30.103"; }
+    { name = "k1-4"; address = "10.1.30.104"; }
+    { name = "k1-5"; address = "10.1.30.105"; }
   ];
 
   mkNode = x: {
-    "${x.name}" = {
+    "${x.name}" =
-      node.name = x.name;
+    lib.mkMerge [
-      node.address = x.address;
+      {
-      imports = [ ./cluster.nix  (./hw + "/${x.name}.nix") ];
+        features.k8s.host = x;
-    };
+      }
+      (if builtins.hasAttr x.name etcdNodes then
+        {
+          features.k8s = { inherit etcdCluster; };
+        }
+        else {})
+      ]
+      // { imports = [ ./cluster.nix  (./hw + "/${x.name}.nix") ]; };
   };
 
 in
   builtins.foldl' (a: x: a // mkNode x) {
-    "${master.node.name}" = master;
+    "${master.features.k8s.host.name}" = master;
   } nodes
 

clusters/k1/hw/k1-4.nix

@@ -1,21 +1,23 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ ];
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "virtio_scsi" "uhci_hcd" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/241cdf57-a2b5-482d-a522-01725badc859";
+    { device = "/dev/disk/by-uuid/8f42bf5b-67bf-401a-97ae-969fd4c808cf";
       fsType = "ext4";
     };
 
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 1;
 }

clusters/k1/hw/k1-5.nix

@@ -0,0 +1,23 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "virtio_scsi" "uhci_hcd" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/8f42bf5b-67bf-401a-97ae-969fd4c808cf";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+}

clusters/k2/default.nix

@@ -1,9 +1,15 @@
 with import <nixpkgs> {};
 let
   etcdNodes = {
-    # k2-0 = "10.1.8.60";
+    k2-0 = "10.1.8.60";
-    # k2-1 = "10.1.8.61";
+    k2-1 = "10.1.8.61";
-    # k2-2 = "10.1.8.62";
+    k2-2 = "10.1.8.62";
+  };
+
+  etcdCluster = {
+    enable = true;
+    existing = true;
+    nodes = etcdNodes;
   };
 
   master = {
@@ -12,10 +18,7 @@ let
       host.address = "10.1.8.60";
       master.enable = true;
       nodes = nodes;
-      etcdCluster = {
+      inherit etcdCluster;
-        enable = false;
-        nodes = etcdNodes;
-      };
     };
     fileSystems = {
       "/vol/local-storage/vol1" = {
@@ -23,7 +26,11 @@ let
         options = [ "bind" ];
       };
     };
-    services.kubernetes.kubelet.unschedulable = true;
+    services.kubernetes.kubelet.taints.unschedulable = {
+      key = "node.kubernetes.io/unschedulable";
+      value = "true";
+      effect = "NoSchedule";
+    };
     imports = [ ./cluster.nix ./hw/k2-0.nix ];
   };
 
@@ -44,17 +51,21 @@ let
       }
       (if builtins.hasAttr x.name etcdNodes then
         {
-          features.k8s.etcdCluster = {
+          features.k8s = { inherit etcdCluster; };
-            enable = false;
-            existing = false;
-            nodes = etcdNodes;
-          };
         }
         else {})
-      ]
+      (if x.name == "k2-6" then
-      // { imports = [ ./cluster.nix  (./hw + "/${x.name}.nix") ]; };
+        {
+          services.kubernetes.kubelet.taints.sonarqube = {
+            key = "reserved";
+            value = "sonarqube";
+            effect = "NoSchedule";
+          };
+        }
+      else {})
+    ]
+    // { imports = [ ./cluster.nix  (./hw + "/${x.name}.nix") ]; };
   };
-
 in
   builtins.foldl' (a: x: a // mkNode x) {
     "${master.features.k8s.host.name}" = master;