Merge branch 'master' into Feature/CON-23163-adding-provision-model-t…

…o-open-api
spotinst · Oct 29, 2023 · 157a571 · 157a571
2 parents 8c805d9 + c62df0f
commit 157a571
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 9 deletions.
diff --git a/api/services/elastigroup/aws/emr/schemas/compute/group-commons/jsonConfiguration.yaml b/api/services/elastigroup/aws/emr/schemas/compute/group-commons/jsonConfiguration.yaml
@@ -21,7 +21,7 @@ items:
         you want to change in the configuration file.
         Duplicates not allowed.
       example: {"mapred.tasktracker.map.tasks.maximum": 2}
-    configuartions:
+    configurations:
       type: array
       description: >
         Array of objects with any keys.

diff --git a/api/services/ocean/aksV2/schemas/ocean-autoScaler.yaml b/api/services/ocean/aksV2/schemas/ocean-autoScaler.yaml
@@ -7,7 +7,6 @@ properties:
     type: boolean
     description: |
       Enable the Ocean Kubernetes Autoscaler.
-    default: true
     example: true
   resourceLimits:
     type: object
@@ -32,7 +31,7 @@ properties:
       maxScaleDownPercentage:
         type: number
         format: double
-        minimum: 0.1
+        minimum: 1
         maximum: 100
         description: The maximum percentage allowed to scale down in a single scaling action.
         example: 30
@@ -46,6 +45,10 @@ properties:
         description: |
           Automatic headroom configuration.
         properties:
+          isEnabled:
+            type: boolean
+            description: |
+              Enable automatic headroom. When set to True, Ocean configures and optimizes headroom automatically.
           percentage:
             type: integer
             description: |

diff --git a/api/services/ocean/aksV2/schemas/ocean-health.yaml b/api/services/ocean/aksV2/schemas/ocean-health.yaml
@@ -5,7 +5,6 @@ description: >
 properties:
   gracePeriod:
     type: integer
-    default: 600
     example: 600
     description: >
       The amount of time to wait, in seconds, from the moment the instance has launched until monitoring of its health checks begins.
diff --git a/api/services/ocean/aksV2/schemas/ocean-nodeCountLimits.yaml b/api/services/ocean/aksV2/schemas/ocean-nodeCountLimits.yaml
@@ -9,9 +9,11 @@ properties:
     type: integer
     minimum: 0
     example: 1
+    default: 0
   maxCount:
     description: |
       Maximum node count limit.
     type: integer
     minimum: 0
-    example: 100
+    example: 100
+    default: 1000
diff --git a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml
@@ -10,24 +10,28 @@ properties:
     minimum: 0
     maximum: 250
     example: 30
+    default: 110
   enableNodePublicIP:
     description: |
       enable node public IP.
     type: boolean
     example: true
+    default: false
   osDiskSizeGB:
     type: integer
     description: |
       The size of the OS disk in GB. 
       For Linux OS, the minimum size is 32GB and for Windows OS the minimum is 128GB.
     maximum: 1023
     example: 64
+    default: 128
   osDiskType:
     type: string
     description: |
       The type of the OS disk.
     enum: [ Managed, Ephemeral ]
     example: Managed
+    default: Managed
   osType:
     type: string
     description: |
@@ -40,6 +44,7 @@ properties:
       The OS SKU of the OS type. Must correlate with the os type.
     enum: [ Ubuntu, AzureLinux, CBLMariner, Windows2019, Windows2022 ]
     example: Ubuntu
+    default: Ubuntu
   kubernetesVersion:
     type: string
     description: |

diff --git a/api/services/ocean/aksV2/schemas/ocean-strategy.yaml b/api/services/ocean/aksV2/schemas/ocean-strategy.yaml
@@ -8,12 +8,10 @@ properties:
     description: >
       Percentage of spot VMs to maintain.
     example: 50
-    default: 100
     minimum: 0
     maximum: 100
   fallbackToOd:
     type: boolean
     description: >
       If no spot instance markets are available, enable Ocean to launch on-demand instances instead.
     example: true
-    default: true
diff --git a/api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml b/api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml
@@ -57,7 +57,7 @@ properties:
         items:
           type: string
         example: [ "Bs", "Da v4" ]
-      minData:
+      minDisk:
         description: |
           Minimum number of data disks available.
         type: integer

diff --git a/api/services/ocean/aksV2/schemas/update/ocean-nodePoolProperties.yaml b/api/services/ocean/aksV2/schemas/update/ocean-nodePoolProperties.yaml
@@ -40,4 +40,18 @@ properties:
       The desired Kubernetes version of the luanched nodes.
       In case the value is null, the Kubernetes version of the control plane
       is used.
-    example: 1.26
+    example: 1.26
+  vnetSubnetIDs:
+    type: array
+    description: |
+      The IDs of subnets in an existing VNet into which to assign nodes in the cluster (requires azure network-plugin).
+    items:
+      type: string
+    example: [ "/subscriptions/123456-1234-1234-1234-123456789/resourceGroups/ExampleResourceGroup/providers/Microsoft.Network/virtualNetworks/ExampleVirtualNetwork/subnets/default" ]
+  podSubnetIDs:
+    type: array
+    description: |
+      The IDs of subnets in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    items:
+      type: string
+    example: [ "/subscriptions/123456-1234-1234-1234-123456789/resourceGroups/ExampleResourceGroup/providers/Microsoft.Network/virtualNetworks/ExampleVirtualNetwork/subnets/default" ]