From 6e84d0a6ba81c9355e5e1b8a82193040b4a9888d Mon Sep 17 00:00:00 2001
From: Mike Dame <mikedame@google.com>
Date: Thu, 12 May 2022 15:35:07 +0000
Subject: [PATCH] React to removal of offensive language

https://github.com/kubernetes/kubeadm/issues/2200 went into effect in 1.24, so
e2es broke without the update.
---
 pkg/descheduler/strategies/duplicates_test.go | 8 ++++----
 test/e2e/e2e_test.go                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/descheduler/strategies/duplicates_test.go b/pkg/descheduler/strategies/duplicates_test.go
index 488bc4a3e..1c5e4d695 100644
--- a/pkg/descheduler/strategies/duplicates_test.go
+++ b/pkg/descheduler/strategies/duplicates_test.go
@@ -378,7 +378,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 		node.Spec.Taints = []v1.Taint{
 			{
 				Effect: v1.TaintEffectNoSchedule,
-				Key:    "node-role.kubernetes.io/master",
+				Key:    "node-role.kubernetes.io/control-plane",
 			},
 		}
 	}
@@ -387,7 +387,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 		if node.ObjectMeta.Labels == nil {
 			node.ObjectMeta.Labels = map[string]string{}
 		}
-		node.ObjectMeta.Labels["node-role.kubernetes.io/master"] = ""
+		node.ObjectMeta.Labels["node-role.kubernetes.io/control-plane"] = ""
 	}
 
 	setWorkerLabel := func(node *v1.Node) {
@@ -407,7 +407,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 						{
 							MatchExpressions: []v1.NodeSelectorRequirement{
 								{
-									Key:      "node-role.kubernetes.io/master",
+									Key:      "node-role.kubernetes.io/control-plane",
 									Operator: v1.NodeSelectorOpDoesNotExist,
 								},
 								{
@@ -431,7 +431,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 						{
 							MatchExpressions: []v1.NodeSelectorRequirement{
 								{
-									Key:      "node-role.kubernetes.io/master",
+									Key:      "node-role.kubernetes.io/control-plane",
 									Operator: v1.NodeSelectorOpDoesNotExist,
 								},
 								{
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 88a945ec3..ff928cbe8 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -1331,7 +1331,7 @@ func splitNodesAndWorkerNodes(nodes []v1.Node) ([]*v1.Node, []*v1.Node) {
 	for i := range nodes {
 		node := nodes[i]
 		allNodes = append(allNodes, &node)
-		if _, exists := node.Labels["node-role.kubernetes.io/master"]; !exists {
+		if _, exists := node.Labels["node-role.kubernetes.io/control-plane"]; !exists {
 			workerNodes = append(workerNodes, &node)
 		}
 	}