Merge branch 'master' into SPOTAUT-17250-GCP-Ocean

spotinst · Feb 9, 2024 · e012fc3 · e012fc3
2 parents ce96071 + 5bd948b
commit e012fc3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/api/services/managedInstance/aws/schemas/mi-compute.yaml b/api/services/managedInstance/aws/schemas/mi-compute.yaml
@@ -208,13 +208,19 @@ properties:
                 deleteOnTermination:
                   type: boolean
                   example: true
+                encrypted:
+                  type: boolean
+                  example: true
                 volumeSize:
                   type: integer
                   example: 12
                 volumeType:
                   type: string
                   example: gp2
-
+                kmsKeyId:
+                  type: string
+                snapshotId:
+                  type: string
 
 
 

diff --git a/api/services/ocean/aws/schemas/oceanCluster.yaml b/api/services/ocean/aws/schemas/oceanCluster.yaml
@@ -64,6 +64,14 @@ properties:
             type: integer
             description: Represents the maximum percent of your instances to scale down in a single scale-down action. Number between 1-100.
             example: 60
+          aggressiveScaleDown:
+            type: object
+            description: Enable and customize the Aggressive Scale Down feature. This allows nodes to be promptly scaled down by the Ocean Autoscaler as soon as they become eligible, without any waiting period.
+            properties:
+              isEnabled:
+                type: boolean
+                description: When set to 'true', the Aggressive Scale Down feature is enabled
+                default: false
       headroom:
         type: object
         description: Spare resource capacity management enabling fast assignment of pods without waiting for new resources to launch.

diff --git a/api/services/ocean/aws/schemas/oceanClusterUpdate.yaml b/api/services/ocean/aws/schemas/oceanClusterUpdate.yaml
@@ -59,6 +59,14 @@ properties:
             type: integer
             description: Represents the maximum percent of your instances to scale down in a single scale-down action. Number between 1-100.
             example: 60
+          aggressiveScaleDown:
+            type: object
+            description: Enable and customize the Aggressive Scale Down feature. This allows nodes to be promptly scaled down by the Ocean Autoscaler as soon as they become eligible, without any waiting period.
+            properties:
+              isEnabled:
+                type: boolean
+                description: When set to 'true', the Aggressive Scale Down feature is enabled
+                default: false
       headroom:
         type: object
         description: Spare resource capacity management enabling fast assignment of pods without waiting for new resources to launch.