oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove defunct taints

Browse Source
This commit is contained in:
Jonas Juselius
2021-09-23 15:54:45 +02:00
parent 28b7d136a7
commit e92f1a6bff
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
clusters/k0/default.nix
View File

@@ -22,11 +22,6 @@ let
nodes = nodes; nodes = nodes;
inherit etcdCluster; inherit etcdCluster;
}; };
services.kubernetes.kubelet.taints.unschedulable = {
key = "node.kubernetes.io/unschedulable";
value = "true";
effect = "NoSchedule";
};
imports = [ ./cluster.nix ./hw/k0-0.nix ]; imports = [ ./cluster.nix ./hw/k0-0.nix ];
}; };

5
clusters/k1/default.nix
View File

@@ -26,11 +26,6 @@ let
options = [ "bind" ]; options = [ "bind" ];
}; };
}; };
services.kubernetes.kubelet.taints.unschedulable = {
key = "node.kubernetes.io/unschedulable";
value = "true";
effect = "NoSchedule";
};
imports = [ ./cluster.nix ./hw/k1-0.nix ]; imports = [ ./cluster.nix ./hw/k1-0.nix ];
}; };

23
clusters/k2/default.nix
View File

@@ -26,11 +26,6 @@ let
options = [ "bind" ]; options = [ "bind" ];
}; };
}; };
services.kubernetes.kubelet.taints.unschedulable = {
key = "node.kubernetes.io/unschedulable";
value = "true";
effect = "NoSchedule";
};
imports = [ ./cluster.nix ./hw/k2-0.nix ]; imports = [ ./cluster.nix ./hw/k2-0.nix ];
}; };
@@ -54,15 +49,15 @@ let
features.k8s = { inherit etcdCluster; }; features.k8s = { inherit etcdCluster; };
} }
else {}) else {})
(if x.name == "k2-6" then # (if x.name == "k2-6" then
{ # {
services.kubernetes.kubelet.taints.sonarqube = { # services.kubernetes.kubelet.taints.sonarqube = {
key = "reserved"; # key = "reserved";
value = "sonarqube"; # value = "sonarqube";
effect = "NoSchedule"; # effect = "NoSchedule";
}; # };
} # }
else {}) # else {})
] ]
// { imports = [ ./cluster.nix (./hw + "/${x.name}.nix") ]; }; // { imports = [ ./cluster.nix (./hw + "/${x.name}.nix") ]; };
}; };