Skip to content

Commit 9596c7f

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1263 from spangenberg/rename-labels
Rename labels from sigs.k8s.io to machine.openshift.io
2 parents bf3263b + be7bf8e commit 9596c7f

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎pkg/asset/machines/aws/machines.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
4949
Namespace: "openshift-machine-api",
5050
Name: fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
5151
Labels: map[string]string{
52-
"sigs.k8s.io/cluster-api-cluster": clusterID,
53-
"sigs.k8s.io/cluster-api-machine-role": role,
54-
"sigs.k8s.io/cluster-api-machine-type": role,
52+
"machine.openshift.io/cluster-api-cluster": clusterID,
53+
"machine.openshift.io/cluster-api-machine-role": role,
54+
"machine.openshift.io/cluster-api-machine-type": role,
5555
},
5656
},
5757
Spec: machineapi.MachineSpec{

‎pkg/asset/machines/aws/machinesets.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,26 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
5151
Namespace: "openshift-machine-api",
5252
Name: name,
5353
Labels: map[string]string{
54-
"sigs.k8s.io/cluster-api-cluster": clusterID,
55-
"sigs.k8s.io/cluster-api-machine-role": role,
56-
"sigs.k8s.io/cluster-api-machine-type": role,
54+
"machine.openshift.io/cluster-api-cluster": clusterID,
55+
"machine.openshift.io/cluster-api-machine-role": role,
56+
"machine.openshift.io/cluster-api-machine-type": role,
5757
},
5858
},
5959
Spec: machineapi.MachineSetSpec{
6060
Replicas: &replicas,
6161
Selector: metav1.LabelSelector{
6262
MatchLabels: map[string]string{
63-
"sigs.k8s.io/cluster-api-machineset": name,
64-
"sigs.k8s.io/cluster-api-cluster": clusterID,
63+
"machine.openshift.io/cluster-api-machineset": name,
64+
"machine.openshift.io/cluster-api-cluster": clusterID,
6565
},
6666
},
6767
Template: machineapi.MachineTemplateSpec{
6868
ObjectMeta: metav1.ObjectMeta{
6969
Labels: map[string]string{
70-
"sigs.k8s.io/cluster-api-machineset": name,
71-
"sigs.k8s.io/cluster-api-cluster": clusterID,
72-
"sigs.k8s.io/cluster-api-machine-role": role,
73-
"sigs.k8s.io/cluster-api-machine-type": role,
70+
"machine.openshift.io/cluster-api-machineset": name,
71+
"machine.openshift.io/cluster-api-cluster": clusterID,
72+
"machine.openshift.io/cluster-api-machine-role": role,
73+
"machine.openshift.io/cluster-api-machine-type": role,
7474
},
7575
},
7676
Spec: machineapi.MachineSpec{

‎pkg/asset/machines/libvirt/machines.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
3939
Namespace: "openshift-machine-api",
4040
Name: fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
4141
Labels: map[string]string{
42-
"sigs.k8s.io/cluster-api-cluster": clusterID,
43-
"sigs.k8s.io/cluster-api-machine-role": role,
44-
"sigs.k8s.io/cluster-api-machine-type": role,
42+
"machine.openshift.io/cluster-api-cluster": clusterID,
43+
"machine.openshift.io/cluster-api-machine-role": role,
44+
"machine.openshift.io/cluster-api-machine-type": role,
4545
},
4646
},
4747
Spec: machineapi.MachineSpec{

‎pkg/asset/machines/libvirt/machinesets.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,26 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
4242
Namespace: "openshift-machine-api",
4343
Name: name,
4444
Labels: map[string]string{
45-
"sigs.k8s.io/cluster-api-cluster": clusterID,
46-
"sigs.k8s.io/cluster-api-machine-role": role,
47-
"sigs.k8s.io/cluster-api-machine-type": role,
45+
"machine.openshift.io/cluster-api-cluster": clusterID,
46+
"machine.openshift.io/cluster-api-machine-role": role,
47+
"machine.openshift.io/cluster-api-machine-type": role,
4848
},
4949
},
5050
Spec: machineapi.MachineSetSpec{
5151
Replicas: pointer.Int32Ptr(int32(total)),
5252
Selector: metav1.LabelSelector{
5353
MatchLabels: map[string]string{
54-
"sigs.k8s.io/cluster-api-machineset": name,
55-
"sigs.k8s.io/cluster-api-cluster": clusterID,
54+
"machine.openshift.io/cluster-api-machineset": name,
55+
"machine.openshift.io/cluster-api-cluster": clusterID,
5656
},
5757
},
5858
Template: machineapi.MachineTemplateSpec{
5959
ObjectMeta: metav1.ObjectMeta{
6060
Labels: map[string]string{
61-
"sigs.k8s.io/cluster-api-machineset": name,
62-
"sigs.k8s.io/cluster-api-cluster": clusterID,
63-
"sigs.k8s.io/cluster-api-machine-role": role,
64-
"sigs.k8s.io/cluster-api-machine-type": role,
61+
"machine.openshift.io/cluster-api-machineset": name,
62+
"machine.openshift.io/cluster-api-cluster": clusterID,
63+
"machine.openshift.io/cluster-api-machine-role": role,
64+
"machine.openshift.io/cluster-api-machine-type": role,
6565
},
6666
},
6767
Spec: machineapi.MachineSpec{

‎pkg/asset/machines/openstack/machines.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
5858
Namespace: "openshift-machine-api",
5959
Name: fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
6060
Labels: map[string]string{
61-
"sigs.k8s.io/cluster-api-cluster": clusterID,
62-
"sigs.k8s.io/cluster-api-machine-role": role,
63-
"sigs.k8s.io/cluster-api-machine-type": role,
61+
"machine.openshift.io/cluster-api-cluster": clusterID,
62+
"machine.openshift.io/cluster-api-machine-role": role,
63+
"machine.openshift.io/cluster-api-machine-type": role,
6464
},
6565
},
6666
Spec: machineapi.MachineSpec{

‎pkg/asset/machines/openstack/machinesets.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,26 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
4848
Namespace: "openshift-machine-api",
4949
Name: name,
5050
Labels: map[string]string{
51-
"sigs.k8s.io/cluster-api-cluster": clusterID,
52-
"sigs.k8s.io/cluster-api-machine-role": role,
53-
"sigs.k8s.io/cluster-api-machine-type": role,
51+
"machine.openshift.io/cluster-api-cluster": clusterID,
52+
"machine.openshift.io/cluster-api-machine-role": role,
53+
"machine.openshift.io/cluster-api-machine-type": role,
5454
},
5555
},
5656
Spec: clusterapi.MachineSetSpec{
5757
Replicas: &total,
5858
Selector: metav1.LabelSelector{
5959
MatchLabels: map[string]string{
60-
"sigs.k8s.io/cluster-api-machineset": name,
61-
"sigs.k8s.io/cluster-api-cluster": clusterID,
60+
"machine.openshift.io/cluster-api-machineset": name,
61+
"machine.openshift.io/cluster-api-cluster": clusterID,
6262
},
6363
},
6464
Template: clusterapi.MachineTemplateSpec{
6565
ObjectMeta: metav1.ObjectMeta{
6666
Labels: map[string]string{
67-
"sigs.k8s.io/cluster-api-machineset": name,
68-
"sigs.k8s.io/cluster-api-cluster": clusterID,
69-
"sigs.k8s.io/cluster-api-machine-role": role,
70-
"sigs.k8s.io/cluster-api-machine-type": role,
67+
"machine.openshift.io/cluster-api-machineset": name,
68+
"machine.openshift.io/cluster-api-cluster": clusterID,
69+
"machine.openshift.io/cluster-api-machine-role": role,
70+
"machine.openshift.io/cluster-api-machine-type": role,
7171
},
7272
},
7373
Spec: clusterapi.MachineSpec{

0 commit comments

Comments
 (0)