Unverified Commit 792195ea authored by Ashley's avatar Ashley

Fix kubeadm taints to not override existing node taints

parent 60cd056c
......@@ -43,8 +43,24 @@ func MarkMaster(client clientset.Interface, masterName string, taints []v1.Taint
})
}
func taintExists(taint v1.Taint, taints []v1.Taint) bool {
for _, t := range taints {
if t == taint {
return true
}
}
return false
}
func markMasterNode(n *v1.Node, taints []v1.Taint) {
n.ObjectMeta.Labels[constants.LabelNodeRoleMaster] = ""
// TODO: Append taints, don't override?
for _, nt := range n.Spec.Taints {
if !taintExists(nt, taints) {
taints = append(taints, nt)
}
}
n.Spec.Taints = taints
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment