From 35615881e30dc34dac2a645e5a409fcc506699c4 Mon Sep 17 00:00:00 2001
From: Ashley <ashley@containership.io>
Date: Thu, 14 Jun 2018 10:57:34 -0400
Subject: [PATCH] Update tests to reflect that kubeadm taints should not
 override node taints

---
 .../app/phases/markmaster/markmaster_test.go  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/cmd/kubeadm/app/phases/markmaster/markmaster_test.go b/cmd/kubeadm/app/phases/markmaster/markmaster_test.go
index 48b421cdbf7..c8f937abd56 100644
--- a/cmd/kubeadm/app/phases/markmaster/markmaster_test.go
+++ b/cmd/kubeadm/app/phases/markmaster/markmaster_test.go
@@ -82,11 +82,28 @@ func TestMarkMaster(t *testing.T) {
 			"{}",
 		},
 		{
-			"nothing missing but taint unwanted",
+			"has taint and no new taints wanted",
 			kubeadmconstants.LabelNodeRoleMaster,
-			[]v1.Taint{kubeadmconstants.MasterTaint},
+			[]v1.Taint{
+				{
+					Key:    "node.cloudprovider.kubernetes.io/uninitialized",
+					Effect: v1.TaintEffectNoSchedule,
+				},
+			},
 			nil,
-			"{\"spec\":{\"taints\":null}}",
+			"{}",
+		},
+		{
+			"has taint and should merge with wanted taint",
+			kubeadmconstants.LabelNodeRoleMaster,
+			[]v1.Taint{
+				{
+					Key:    "node.cloudprovider.kubernetes.io/uninitialized",
+					Effect: v1.TaintEffectNoSchedule,
+				},
+			},
+			[]v1.Taint{kubeadmconstants.MasterTaint},
+			"{\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"},{\"effect\":\"NoSchedule\",\"key\":\"node.cloudprovider.kubernetes.io/uninitialized\"}]}}",
 		},
 	}