Make control node only unschedulable

cluster/reconcile.go

@@ -16,7 +16,8 @@ import (
 )
 
 const (
-	unschedulableEtcdTaint = "node-role.kubernetes.io/etcd=true:NoExecute"
+	unschedulableEtcdTaint    = "node-role.kubernetes.io/etcd=true:NoExecute"
+	unschedulableControlTaint = "node-role.kubernetes.io/controlplane=true:NoExecute"
 )
 
 func ReconcileCluster(ctx context.Context, kubeCluster, currentCluster *Cluster, updateOnly bool) error {
@@ -72,6 +73,9 @@ func reconcileWorker(ctx context.Context, currentCluster, kubeCluster *Cluster,
 		if host.IsEtcd {
 			host.ToDelTaints = append(host.ToDelTaints, unschedulableEtcdTaint)
 		}
+		if host.IsControl {
+			host.ToDelTaints = append(host.ToDelTaints, unschedulableControlTaint)
+		}
 	}
 	return nil
 }

services/workerplane.go

@@ -11,7 +11,8 @@ import (
 )
 
 const (
-	unschedulableEtcdTaint = "node-role.kubernetes.io/etcd=true:NoExecute"
+	unschedulableEtcdTaint    = "node-role.kubernetes.io/etcd=true:NoExecute"
+	unschedulableControlTaint = "node-role.kubernetes.io/controlplane=true:NoExecute"
 )
 
 func RunWorkerPlane(ctx context.Context, allHosts []*hosts.Host, localConnDialerFactory hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, workerNodePlanMap map[string]v3.RKEConfigNodePlan, certMap map[string]pki.CertificatePKI, updateWorkersOnly bool, alpineImage string) error {
@@ -23,9 +24,16 @@ func RunWorkerPlane(ctx context.Context, allHosts []*hosts.Host, localConnDialer
 				continue
 			}
 		}
-		if !host.IsControl && !host.IsWorker {
-			// Add unschedulable taint
-			host.ToAddTaints = append(host.ToAddTaints, unschedulableEtcdTaint)
+		if !host.IsWorker {
+			if host.IsEtcd {
+				// Add unschedulable taint
+				host.ToAddTaints = append(host.ToAddTaints, unschedulableEtcdTaint)
+			}
+			if host.IsControl {
+				// Add unschedulable taint
+				host.ToAddTaints = append(host.ToAddTaints, unschedulableControlTaint)
+			}
+
 		}
 		runHost := host
 		// maps are not thread safe

templates/calico.go

@@ -183,8 +183,9 @@ spec:
           operator: Exists
         - effect: NoExecute
           operator: Exists
-        - key: "node-role.kubernetes.io/master"
+        - key: "node-role.kubernetes.io/controlplane"
           operator: "Exists"
+          effect: "NoExecute"
         - key: "node-role.kubernetes.io/etcd"
           operator: "Exists"
           effect: "NoExecute"

templates/canal.go

@@ -240,8 +240,9 @@ spec:
           operator: Exists
         - effect: NoExecute
           operator: Exists
-        - key: "node-role.kubernetes.io/master"
+        - key: "node-role.kubernetes.io/controlplane"
           operator: "Exists"
+          effect: "NoExecute"
         - key: "node-role.kubernetes.io/etcd"
           operator: "Exists"
           effect: "NoExecute"

templates/flannel.go

@@ -148,9 +148,9 @@ spec:
           mountPath: /host/opt/cni/bin/
       hostNetwork: true
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/controlplane
         operator: Exists
-        effect: NoSchedule
+        effect: NoExecute
       - key: node-role.kubernetes.io/etcd
         operator: Exists
         effect: NoExecute

templates/job-deployer.go

@@ -14,6 +14,13 @@ spec:
     metadata:
        name: pi
     spec:
+        tolerations:
+        - key: node-role.kubernetes.io/controlplane
+          operator: Exists
+          effect: NoExecute
+        - key: node-role.kubernetes.io/etcd
+          operator: Exists
+          effect: NoExecute
         hostNetwork: true
         serviceAccountName: rke-job-deployer
         nodeName: {{$nodeName}}

templates/weave.go

@@ -96,6 +96,12 @@ items:
             seLinuxOptions: {}
           serviceAccountName: weave-net
           tolerations:
+            - key: "node-role.kubernetes.io/controlplane"
+              operator: "Exists"
+              effect: "NoExecute"
+            - key: "node-role.kubernetes.io/etcd"
+              operator: "Exists"
+              effect: "NoExecute"
             - effect: NoExecute
               operator: Exists
           volumes: