Update k8s clusters and fs servers

clusters/k2/default.nix

@@ -1,9 +1,15 @@
 with import <nixpkgs> {};
 let
   etcdNodes = {
-    # k2-0 = "10.1.8.60";
-    # k2-1 = "10.1.8.61";
-    # k2-2 = "10.1.8.62";
+    k2-0 = "10.1.8.60";
+    k2-1 = "10.1.8.61";
+    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 = {
-        enable = false;
-        nodes = etcdNodes;
-      };
+      inherit etcdCluster;
     };
     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 = {
-            enable = false;
-            existing = false;
-            nodes = etcdNodes;
-          };
+          features.k8s = { inherit etcdCluster; };
         }
         else {})
-      ]
-      // { imports = [ ./cluster.nix  (./hw + "/${x.name}.nix") ]; };
+      (if x.name == "k2-6" then
+        {
+          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;