From e92f1a6bff8800f3cdb3bd4cd82f8f0d6040483e Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@tromso.serit.no>
Date: Thu, 23 Sep 2021 15:54:45 +0200
Subject: [PATCH] Remove defunct taints

---
 clusters/k0/default.nix |  5 -----
 clusters/k1/default.nix |  5 -----
 clusters/k2/default.nix | 23 +++++++++--------------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/clusters/k0/default.nix b/clusters/k0/default.nix
index bb70d9a..ccc963e 100644
--- a/clusters/k0/default.nix
+++ b/clusters/k0/default.nix
@@ -22,11 +22,6 @@ let
       nodes = nodes;
       inherit etcdCluster;
     };
-    services.kubernetes.kubelet.taints.unschedulable = {
-      key = "node.kubernetes.io/unschedulable";
-      value = "true";
-      effect = "NoSchedule";
-    };
     imports = [ ./cluster.nix ./hw/k0-0.nix ];
   };
 
diff --git a/clusters/k1/default.nix b/clusters/k1/default.nix
index 1718a2c..9415b9a 100644
--- a/clusters/k1/default.nix
+++ b/clusters/k1/default.nix
@@ -26,11 +26,6 @@ let
         options = [ "bind" ];
       };
     };
-    services.kubernetes.kubelet.taints.unschedulable = {
-      key = "node.kubernetes.io/unschedulable";
-      value = "true";
-      effect = "NoSchedule";
-    };
     imports = [ ./cluster.nix ./hw/k1-0.nix ];
   };
 
diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix
index 7bb08fa..d365f37 100644
--- a/clusters/k2/default.nix
+++ b/clusters/k2/default.nix
@@ -26,11 +26,6 @@ let
         options = [ "bind" ];
       };
     };
-    services.kubernetes.kubelet.taints.unschedulable = {
-      key = "node.kubernetes.io/unschedulable";
-      value = "true";
-      effect = "NoSchedule";
-    };
     imports = [ ./cluster.nix ./hw/k2-0.nix ];
   };
 
@@ -54,15 +49,15 @@ let
           features.k8s = { inherit etcdCluster; };
         }
         else {})
-      (if x.name == "k2-6" then
-        {
-          services.kubernetes.kubelet.taints.sonarqube = {
-            key = "reserved";
-            value = "sonarqube";
-            effect = "NoSchedule";
-          };
-        }
-      else {})
+      # (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") ]; };
   };