From 0499b0e126b02e639d591c8ca263a384c0ace6de Mon Sep 17 00:00:00 2001 From: noamSpot <117283267+noamSpot@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:47:33 +0200 Subject: [PATCH 1/2] CON-20634 (#574) * cr * cr * cr * [src] cr changes --------- Co-authored-by: Moshe Dahan --- api/services/ocean/aws/schemas/oceanCluster.yaml | 8 ++++++++ api/services/ocean/aws/schemas/oceanClusterUpdate.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/api/services/ocean/aws/schemas/oceanCluster.yaml b/api/services/ocean/aws/schemas/oceanCluster.yaml index 4be39ac37..694ab0184 100644 --- 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 index 08656913d..1bff54cb4 100644 --- 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. From 5bd948b4f7b1da609f8ad6bd8226f4a9b099c242 Mon Sep 17 00:00:00 2001 From: Anurag Sharma Date: Thu, 8 Feb 2024 20:39:16 -0500 Subject: [PATCH 2/2] Adding 'encrypted', 'kmsKeyId', 'snapshotId' fields in AWS MI Specification (#569) --- api/services/managedInstance/aws/schemas/mi-compute.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/api/services/managedInstance/aws/schemas/mi-compute.yaml b/api/services/managedInstance/aws/schemas/mi-compute.yaml index b5b7595e9..13f2d59d2 100644 --- 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