Merge pull request #1686 from enxebre/add-label

BUG 1702050: Add aws role labels back (revert #1474)
openshift · May 1, 2019 · aa70e4c · aa70e4c
2 parents ef2362d + 0fe8619
commit aa70e4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
@@ -49,7 +49,9 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Namespace: "openshift-machine-api",
 				Name:      fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
 				Labels: map[string]string{
-					"machine.openshift.io/cluster-api-cluster": clusterID,
+					"machine.openshift.io/cluster-api-cluster":      clusterID,
+					"machine.openshift.io/cluster-api-machine-role": role,
+					"machine.openshift.io/cluster-api-machine-type": role,
 				},
 			},
 			Spec: machineapi.MachineSpec{

diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go
@@ -58,15 +58,19 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 				Replicas: &replicas,
 				Selector: metav1.LabelSelector{
 					MatchLabels: map[string]string{
-						"machine.openshift.io/cluster-api-machineset": name,
-						"machine.openshift.io/cluster-api-cluster":    clusterID,
+						"machine.openshift.io/cluster-api-machineset":   name,
+						"machine.openshift.io/cluster-api-cluster":      clusterID,
+						"machine.openshift.io/cluster-api-machine-role": role,
+						"machine.openshift.io/cluster-api-machine-type": role,
 					},
 				},
 				Template: machineapi.MachineTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Labels: map[string]string{
-							"machine.openshift.io/cluster-api-machineset": name,
-							"machine.openshift.io/cluster-api-cluster":    clusterID,
+							"machine.openshift.io/cluster-api-machineset":   name,
+							"machine.openshift.io/cluster-api-cluster":      clusterID,
+							"machine.openshift.io/cluster-api-machine-role": role,
+							"machine.openshift.io/cluster-api-machine-type": role,
 						},
 					},
 					Spec: machineapi.MachineSpec{