Fix inconsistency by updating constant 'ClusterLabelName' to 'Cluster…

…NameLabel' arised post resolve conflicts Signed-off-by: Chirayu Kapoor <dev.csociety@gmail.com>
kubernetes-sigs · Nov 28, 2022 · f9903f8 · f9903f8
1 parent 08b7635
commit f9903f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controlplane/kubeadm/internal/controllers/helpers_test.go b/controlplane/kubeadm/internal/controllers/helpers_test.go
@@ -549,7 +549,7 @@ func TestKubeadmControlPlaneReconciler_generateMachine(t *testing.T) {
 	for k, v := range kcpMachineTemplateObjectMeta.Labels {
 		g.Expect(machine.Labels[k]).To(Equal(v))
 	}
-	g.Expect(machine.Labels[clusterv1.ClusterLabelName]).To(Equal(cluster.Name))
+	g.Expect(machine.Labels[clusterv1.ClusterNameLabel]).To(Equal(cluster.Name))
 	g.Expect(machine.Labels[clusterv1.MachineControlPlaneLabelName]).To(Equal(""))
 	g.Expect(machine.Labels[clusterv1.MachineControlPlaneNameLabel]).To(Equal(kcp.Name))
 

diff --git a/internal/controllers/machinedeployment/machinedeployment_controller_test.go b/internal/controllers/machinedeployment/machinedeployment_controller_test.go
@@ -208,8 +208,8 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 		g.Expect(*firstMachineSet.Spec.Replicas).To(BeEquivalentTo(2))
 		g.Expect(*firstMachineSet.Spec.Template.Spec.Version).To(BeEquivalentTo("v1.10.3"))
 
-		t.Log("Verify MachineSet has expected ClusterLabelName and MachineDeploymentLabelName")
-		g.Expect(firstMachineSet.Labels[clusterv1.ClusterLabelName]).To(Equal(testCluster.Name))
+		t.Log("Verify MachineSet has expected ClusterNameLabel and MachineDeploymentLabelName")
+		g.Expect(firstMachineSet.Labels[clusterv1.ClusterNameLabel]).To(Equal(testCluster.Name))
 		g.Expect(firstMachineSet.Labels[clusterv1.MachineDeploymentLabelName]).To(Equal(deployment.Name))
 
 		t.Log("Verify expected number of Machines are created")
@@ -221,7 +221,7 @@ func TestMachineDeploymentReconciler(t *testing.T) {
 			return len(machines.Items)
 		}, timeout).Should(BeEquivalentTo(*deployment.Spec.Replicas))
 
-		t.Log("Verify Machines have expected ClusterLabelName, MachineDeploymentLabelName and MachineSetLabelName")
+		t.Log("Verify Machines have expected ClusterNameLabel, MachineDeploymentLabelName and MachineSetLabelName")
 		for _, m := range machines.Items {
 			g.Expect(m.Labels[clusterv1.ClusterNameLabel]).To(Equal(testCluster.Name))
 			g.Expect(m.Labels[clusterv1.MachineDeploymentLabelName]).To(Equal(deployment.Name))