Merge pull request #64986 from ashleyschuett/fix/kubeadmmastertaints

Automatic merge from submit-queue. Fixed taints being applied to master if NoTaintMaster is true **What this PR does / why we need it**: This PR fixes removing the master taint when `noTaintMaster` is true. It will append all current taints to the `taints` variable unless it is a master taint, and then assign `taints` back to the `node.Spec.Taints` property. The function currently will add the master taint to the `taints` variable for as many taints as the master has. It will also remove any taints that are on the master. ```release-note Fixed NoTaintMaster to remove master taint and keep all other applied taints. ```

Merge pull request #64986 from ashleyschuett/fix/kubeadmmastertaints
b44fb756 · Kubernetes Submit Queue · GitHub · b092939e · b1c75eb0 · b44fb756
Unverified Commit b44fb756 authored Jun 14, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

markmaster.go cmd/kubeadm/app/phases/markmaster/markmaster.go +1 -1

No files found.
--- a/cmd/kubeadm/app/phases/markmaster/markmaster.go
+++ b/cmd/kubeadm/app/phases/markmaster/markmaster.go
@@ -115,7 +115,7 @@ func delTaintIfExists(n *v1.Node, t v1.Taint) {
 		if taint == t {
 			continue
 		}
-		taints = append(taints, t)
+		taints = append(taints, taint)
 	}
 	n.Spec.Taints = taints
 }