Merge pull request #6993 from goto-opensource/fix-scale-from-zero-wit…

…h-instance-type-selector OCI: Fixing scale from zero if the nodeSelector of workload contains 'node.kubernetes.io/instance-type'
kubernetes · Jul 10, 2024 · bc6489b · bc6489b
2 parents 7dfb90a + 5d61057
commit bc6489b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/oci/common/oci_shape.go b/cluster-autoscaler/cloudprovider/oci/common/oci_shape.go
@@ -83,7 +83,8 @@ func (osf *shapeGetterImpl) GetNodePoolShape(np *oke.NodePool, ephemeralStorage
 	shapeName := *np.NodeShape
 	if np.NodeShapeConfig != nil {
 		return &Shape{
-			CPU: *np.NodeShapeConfig.Ocpus * 2,
+			Name: shapeName,
+			CPU:  *np.NodeShapeConfig.Ocpus * 2,
 			// num_bytes * kilo * mega * giga
 			MemoryInBytes:           *np.NodeShapeConfig.MemoryInGBs * 1024 * 1024 * 1024,
 			GPU:                     0,
@@ -115,6 +116,7 @@ func (osf *shapeGetterImpl) GetNodePoolShape(np *oke.NodePool, ephemeralStorage
 	// Update the cache based on latest results
 	for _, s := range resp.Items {
 		osf.cache[*s.Shape] = &Shape{
+			Name:                    shapeName,
 			CPU:                     getFloat32(s.Ocpus) * 2, // convert ocpu to vcpu
 			GPU:                     getInt(s.Gpus),
 			MemoryInBytes:           getFloat32(s.MemoryInGBs) * 1024 * 1024 * 1024,

diff --git a/cluster-autoscaler/cloudprovider/oci/common/oci_shape_test.go b/cluster-autoscaler/cloudprovider/oci/common/oci_shape_test.go
@@ -95,6 +95,7 @@ func TestNodePoolGetShape(t *testing.T) {
 		"basic shape": {
 			shape: "VM.Standard1.2",
 			expected: &Shape{
+				Name:                    "VM.Standard1.2",
 				CPU:                     4,
 				MemoryInBytes:           16 * 1024 * 1024 * 1024,
 				GPU:                     0,
@@ -108,6 +109,7 @@ func TestNodePoolGetShape(t *testing.T) {
 				MemoryInGBs: common.Float32(64),
 			},
 			expected: &Shape{
+				Name:                    "VM.Standard.E3.Flex",
 				CPU:                     8,
 				MemoryInBytes:           4 * 16 * 1024 * 1024 * 1024,
 				GPU:                     0,