Taint masters with PreferNoSchedule

Workaround for platform9/ssh-provider#63
platform9 · Jan 29, 2019 · 24b8d0c · 24b8d0c
1 parent 72fd7f4
commit 24b8d0c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cmd/machine.go b/cmd/machine.go
@@ -323,12 +323,20 @@ func newProvisionedMachineAndMachine(name string, role clustercommon.MachineRole
 			CreationTimestamp: metav1.Now(),
 		},
 		Spec: clusterv1.MachineSpec{
-			Roles:  []clustercommon.MachineRole{role},
-			Taints: []corev1.Taint{},
+			Roles: []clustercommon.MachineRole{role},
 		},
 		Status: clusterv1.MachineStatus{},
 	}
 
+	if role == clustercommon.MasterRole {
+		newMachine.Spec.Taints = []corev1.Taint{
+			{
+				Key:    common.LabelNodeRoleMaster,
+				Effect: corev1.TaintEffectPreferNoSchedule,
+			},
+		}
+	}
+
 	machineProviderSpec := spv1.MachineSpec{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "sshprovider.platform9.com/v1alpha1",

diff --git a/common/constants.go b/common/constants.go
@@ -66,6 +66,8 @@ Machine IP             Creation Timestamp                      Role
 {{ range $machine := .}}{{ $machine.ObjectMeta.Name }}           {{ $machine.ObjectMeta.CreationTimestamp }}           {{ $machine.Spec.Roles }}
 {{ end }}
 `
+	// LabelNodeRoleMaster specifies that a node is a master
+	LabelNodeRoleMaster = "node-role.kubernetes.io/master"
 )
 
 var (