Fix #157: Use stable instance-type in inflight controllers (#158)

Signed-off-by: alexandr.danilin <alexandr.danilin@ooma.com> Signed-off-by: alexandr.danilin <alexandr.danilin@ooma.com> Co-authored-by: Alexandr Danilin <alexandr.danilin@ooma.com>
kubernetes-sigs · Jan 10, 2023 · 7939cc9 · 7939cc9
1 parent 1682744
commit 7939cc9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controllers/inflightchecks/failedinit.go b/pkg/controllers/inflightchecks/failedinit.go
@@ -61,11 +61,11 @@ func (f FailedInit) Check(ctx context.Context, n *v1.Node, provisioner *v1alpha5
 		return nil, err
 	}
 
-	instanceType, ok := lo.Find(instanceTypes, func(it *cloudprovider.InstanceType) bool { return it.Name == n.Labels[v1.LabelInstanceType] })
+	instanceType, ok := lo.Find(instanceTypes, func(it *cloudprovider.InstanceType) bool { return it.Name == n.Labels[v1.LabelInstanceTypeStable] })
 	if !ok {
 		return []Issue{{
 			node:    n,
-			message: fmt.Sprintf("Instance Type %q not found", n.Labels[v1.LabelInstanceType]),
+			message: fmt.Sprintf("Instance Type %q not found", n.Labels[v1.LabelInstanceTypeStable]),
 		}}, nil
 	}
 

diff --git a/pkg/controllers/inflightchecks/nodeshape.go b/pkg/controllers/inflightchecks/nodeshape.go
@@ -52,11 +52,11 @@ func (n *NodeShape) Check(ctx context.Context, node *v1.Node, provisioner *v1alp
 		return nil, err
 	}
 
-	instanceType, ok := lo.Find(instanceTypes, func(it *cloudprovider.InstanceType) bool { return it.Name == node.Labels[v1.LabelInstanceType] })
+	instanceType, ok := lo.Find(instanceTypes, func(it *cloudprovider.InstanceType) bool { return it.Name == node.Labels[v1.LabelInstanceTypeStable] })
 	if !ok {
 		return []Issue{{
 			node:    node,
-			message: fmt.Sprintf("Instance Type %q not found", node.Labels[v1.LabelInstanceType]),
+			message: fmt.Sprintf("Instance Type %q not found", node.Labels[v1.LabelInstanceTypeStable]),
 		}}, nil
 	}
 	var issues []Issue

diff --git a/pkg/controllers/inflightchecks/suite_test.go b/pkg/controllers/inflightchecks/suite_test.go
@@ -89,7 +89,7 @@ var _ = Describe("Controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
 						v1alpha5.ProvisionerNameLabelKey: provisioner.Name,
-						v1.LabelInstanceType:             "gpu-vendor-instance-type",
+						v1.LabelInstanceTypeStable:       "gpu-vendor-instance-type",
 					},
 				},
 			})
@@ -113,7 +113,7 @@ var _ = Describe("Controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
 						v1alpha5.ProvisionerNameLabelKey: provisioner.Name,
-						v1.LabelInstanceType:             "default-instance-type",
+						v1.LabelInstanceTypeStable:       "default-instance-type",
 					},
 				},
 			})
@@ -136,7 +136,7 @@ var _ = Describe("Controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
 						v1alpha5.ProvisionerNameLabelKey: provisioner.Name,
-						v1.LabelInstanceType:             "default-instance-type",
+						v1.LabelInstanceTypeStable:       "default-instance-type",
 					},
 				},
 			})
@@ -166,7 +166,7 @@ var _ = Describe("Controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
 						v1alpha5.ProvisionerNameLabelKey: provisioner.Name,
-						v1.LabelInstanceType:             "arm-instance-type",
+						v1.LabelInstanceTypeStable:       "arm-instance-type",
 						v1alpha5.LabelNodeInitialized:    "true",
 					},
 				},