Merge pull request #519 from enxebre/machinesets

add explicit machineset label
openshift · Oct 24, 2018 · f6171bb · f6171bb
2 parents 3fa7a19 + 99e640d
commit f6171bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/asset/machines/aws/worker.go b/pkg/asset/machines/aws/worker.go
@@ -53,12 +53,12 @@ items:
     replicas: {{$instance.Replicas}}
     selector:
       matchLabels:
-        sigs.k8s.io/cluster-api-machineset: worker
+        sigs.k8s.io/cluster-api-machineset: {{$c.ClusterName}}-worker-{{$index}}
         sigs.k8s.io/cluster-api-cluster: {{$c.ClusterName}}
     template:
       metadata:
         labels:
-          sigs.k8s.io/cluster-api-machineset: worker
+          sigs.k8s.io/cluster-api-machineset: {{$c.ClusterName}}-worker-{{$index}}
           sigs.k8s.io/cluster-api-cluster: {{$c.ClusterName}}
           sigs.k8s.io/cluster-api-machine-role: worker
           sigs.k8s.io/cluster-api-machine-type: worker

diff --git a/pkg/asset/machines/libvirt/worker.go b/pkg/asset/machines/libvirt/worker.go
@@ -29,14 +29,14 @@ spec:
   replicas: {{.Replicas}}
   selector:
     matchLabels:
-      sigs.k8s.io/cluster-api-machineset: worker
+      sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
       sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
       sigs.k8s.io/cluster-api-machine-role: worker
       sigs.k8s.io/cluster-api-machine-type: worker
   template:
     metadata:
       labels:
-        sigs.k8s.io/cluster-api-machineset: worker
+        sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
         sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
         sigs.k8s.io/cluster-api-machine-role: worker
         sigs.k8s.io/cluster-api-machine-type: worker

diff --git a/pkg/asset/machines/openstack/worker.go b/pkg/asset/machines/openstack/worker.go
@@ -32,12 +32,12 @@ spec:
   replicas: {{.Replicas}}
   selector:
     matchLabels:
-      sigs.k8s.io/cluster-api-machineset: worker
+      sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
       sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
   template:
     metadata:
       labels:
-        sigs.k8s.io/cluster-api-machineset: worker
+        sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
         sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
         sigs.k8s.io/cluster-api-machine-role: worker
         sigs.k8s.io/cluster-api-machine-type: worker