Fix kubeadm taints to not override existing node taints
This commit is contained in:
parent
60cd056cb4
commit
792195eaa5
@ -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) {
|
func markMasterNode(n *v1.Node, taints []v1.Taint) {
|
||||||
n.ObjectMeta.Labels[constants.LabelNodeRoleMaster] = ""
|
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
|
n.Spec.Taints = taints
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user