From 2a60df147ac498448a4c5f9baadc946f27f9a0b3 Mon Sep 17 00:00:00 2001
From: vikaschoudhary16 <vichoudh@redhat.com>
Date: Mon, 25 Mar 2019 18:45:20 +0530
Subject: [PATCH] Drop unused labels

---
 .../machinehealthcheck_controller.go            | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go b/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
index f8ed3f762d..6fe2c0815b 100644
--- a/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
+++ b/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
@@ -331,30 +331,17 @@ func hasMatchingLabels(machineHealthCheck *healthcheckingv1alpha1.MachineHealthC
 }
 
 func isMaster(machine mapiv1.Machine, client client.Client) bool {
-	machineMasterLabels := []string{
-		"machine.openshift.io/cluster-api-machine-role",
-		"machine.openshift.io/cluster-api-machine-type",
-		"sigs.k8s.io/cluster-api-machine-role",
-		"sigs.k8s.io/cluster-api-machine-type",
-	}
-	nodeMasterLabels := []string{
+	masterLabels := []string{
 		"node-role.kubernetes.io/master",
 	}
 
-	machineLabels := labels.Set(machine.Labels)
-	for _, masterLabel := range machineMasterLabels {
-		if machineLabels.Get(masterLabel) == "master" {
-			return true
-		}
-	}
-
 	node, err := getNodeFromMachine(machine, client)
 	if err != nil {
 		glog.Warningf("Couldn't get node for machine %s", machine.Name)
 		return false
 	}
 	nodeLabels := labels.Set(node.Labels)
-	for _, masterLabel := range nodeMasterLabels {
+	for _, masterLabel := range masterLabels {
 		if nodeLabels.Has(masterLabel) {
 			return true
 		}