Fixing scale from zero if the nodeSelector of workload contains 'node…

….kubernetes.io/instance-type'
goto-opensource · Jul 1, 2024 · b17f420 · b17f420
1 parent 3c6dd26
commit b17f420
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/oci/common/oci_shape.go b/cluster-autoscaler/cloudprovider/oci/common/oci_shape.go
@@ -83,6 +83,7 @@ func (osf *shapeGetterImpl) GetNodePoolShape(np *oke.NodePool, ephemeralStorage
  shapeName := *np.NodeShape
  if np.NodeShapeConfig != nil {
  return &Shape{
+ Name: shapeName,
  CPU: *np.NodeShapeConfig.Ocpus * 2,
  // num_bytes * kilo * mega * giga
  MemoryInBytes: *np.NodeShapeConfig.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,