Adjust test suite to check MachineDeploymentName

Previously we were comparing instanceType.Name to
machineDeployment.Name, but with the change to
machineDeploymentToInstanceType where we are setting the instanceType
name to the instanceTyple label, those fields no longer line up, so we
need to adjust the test suite to check against the field where we
actually stuff that value (instanceType.MachineDeploymentName).

We probably need an additional test to test the label behavior.

Signed-off-by: John Kyros <[email protected]>

Author: jkyros

pkg/cloudprovider/cloudprovider.go

@@ -606,6 +606,7 @@ func machineDeploymentToInstanceType(machineDeployment *capiv1beta1.MachineDeplo
 	// For now, we check the labels we know about from the MachineDeployment, if the instance type label
 	// is not there, leave it blank.
 	// to the v1.LabelInstanceTypeStable. if karpenter expects this to match the node, then we need to get this value through capi.
+	// TODO (jkyros) Add a test case to test this behavior
 	instanceType.Name = labels[corev1.LabelInstanceTypeStable]
 
 	// TODO (elmiko) add the proper overhead information, not sure where we will harvest this information.

pkg/cloudprovider/cloudprovider_test.go

@@ -349,7 +349,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		Expect(instanceType.Capacity).Should(HaveKeyWithValue(corev1.ResourceCPU, resource.MustParse("1")))
 		Expect(instanceType.Capacity).Should(HaveKeyWithValue(corev1.ResourceMemory, resource.MustParse("16Gi")))
 		Expect(instanceType.Capacity).Should(HaveKeyWithValue(corev1.ResourceName("nvidia.com/gpu"), resource.MustParse("1")))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds nothing to requirements when no managed labels or scale from zero annotations are present", func() {
@@ -358,7 +358,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		instanceType := machineDeploymentToInstanceType(machineDeployment)
 
 		Expect(instanceType.Requirements).To(HaveLen(0))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds labels to the requirements from the Cluster API propagation rules", func() {
@@ -381,7 +381,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		Expect(instanceType.Requirements).Should(HaveKey("prefixed.node-restriction.kubernetes.io/some-other-thing"))
 		Expect(instanceType.Requirements).Should(HaveKey("node.cluster.x-k8s.io/another-thing"))
 		Expect(instanceType.Requirements).Should(HaveKey("prefixed.node.cluster.x-k8s.io/another-thing"))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds labels to the requirements from the scale from zero annotations", func() {
@@ -395,7 +395,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		Expect(instanceType.Requirements).To(HaveLen(2))
 		Expect(instanceType.Requirements).Should(HaveKey(corev1.LabelTopologyZone))
 		Expect(instanceType.Requirements).Should(HaveKey(InstanceSizeLabelKey))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds labels to the requirements from the propagation rules and the scale from zero annotations", func() {
@@ -424,7 +424,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		Expect(instanceType.Requirements).Should(HaveKey("prefixed.node-restriction.kubernetes.io/some-other-thing"))
 		Expect(instanceType.Requirements).Should(HaveKey("node.cluster.x-k8s.io/another-thing"))
 		Expect(instanceType.Requirements).Should(HaveKey("prefixed.node.cluster.x-k8s.io/another-thing"))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds a single available on-demand offering with price 0 and empty zone", func() {
@@ -438,7 +438,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		Expect(offering.Requirements[karpv1.CapacityTypeLabelKey].Values()).Should(ContainElement(karpv1.CapacityTypeOnDemand))
 		Expect(offering.Requirements).Should(HaveKey(corev1.LabelTopologyZone))
 		Expect(offering.Requirements[corev1.LabelTopologyZone].Values()).Should(ContainElement(""))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 
 	It("adds the correct zone to offering when the well known zone label is present", func() {
@@ -453,7 +453,7 @@ var _ = Describe("machineDeploymentToInstanceType function", func() {
 		offering := instanceType.Offerings[0]
 		Expect(offering.Requirements).Should(HaveKey(corev1.LabelTopologyZone))
 		Expect(offering.Requirements[corev1.LabelTopologyZone].Values()).Should(ContainElement(zone))
-		Expect(instanceType.Name).To(Equal(machineDeployment.Name))
+		Expect(instanceType.MachineDeploymentName).To(Equal(machineDeployment.Name))
 	})
 })