Merge branch 'master' into CON-22542_vng_instance_types_filters

api/services/elastigroup/aws/schemas/elastigroup-strategy.yaml

@@ -28,6 +28,12 @@ properties:
     example: true
     description: |
       When set to `true` Elastigroup will launch On Demand instances if no spot market is available
+  considerODPricing:
+    type: boolean
+    default: false
+    example: false
+    description: |
+      When the value is set to `true`, Elastigroup will prioritize launching On-Demand instances if they are found to be more cost-effective than available Spot markets.
   utilizeReservedInstances:
     type: boolean
     description: |

api/services/elastigroup/aws/schemas/elastigroupCreate.yaml

@@ -96,6 +96,12 @@ properties:
             example: true
             description: |
               When set to `true` Elastigroup will launch On Demand instances if no spot market is available
+          considerODPricing:
+            type: boolean
+            default: false
+            example: false
+            description: |
+              When the value is set to `true`, Elastigroup will prioritize launching On-Demand instances if they are found to be more cost-effective than available Spot markets.
           utilizeReservedInstances:
             type: boolean
             description: |

api/services/elastigroup/azure/stateful/node/paths/swapOsDisk.yaml

@@ -1,7 +1,7 @@
 put:
   summary: "Swap OS Disk to Stateful Node"
   description:
-    Configure a new OS disk for an OS persisted paused Stateful Node.
+    Configure a new managed OS disk for an OS persisted paused Stateful Node.
   operationId: "azureStatefulNodeSwapOSDisk"
   tags:
     - Elastigroup Azure Stateful

api/services/elastigroup/azure/stateful/node/schemas/importVmObject.yaml

@@ -32,8 +32,14 @@ properties:
     type: integer
     example: 1
     description: |
-      Time in hours to delete the original resources after the import has finished
+      Time in hours to delete the original resources after the import has finished.
     minimum: 0
     maximum: 731
+  convertUnmanagedDisks:
+    type: boolean
+    example: true
+    description: |
+      Converts virtual machine unmanaged disks to managed disks.
+    default: false
   node:
     $ref: "./statefulNodeObject.yaml"

api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml

@@ -16,18 +16,18 @@ properties:
     type: boolean
     example: true
   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
+    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
   osDiskType:
-      type: string
-      description: |
-        The type of the OS disk.
-      enum: [ Managed, Ephemeral ]
-      example: Managed
+    type: string
+    description: |
+      The type of the OS disk.
+    enum: [ Managed, Ephemeral ]
+    example: Managed
   osType:
     type: string
     description: |
@@ -43,7 +43,21 @@ properties:
   kubernetesVersion:
     type: string
     description: |
-      The desired Kubernetes version of the luanched nodes.
+      The desired Kubernetes version of the launched 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" ]

api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml

@@ -56,4 +56,54 @@ properties:
           Vm sizes belonging to a series from the list will not be available for scaling.
         items:
           type: string
-        example: [ "Bs", "Da v4" ]
+        example: [ "Bs", "Da v4" ]
+      minData:
+        description: |
+          Minimum number of data disks available.
+        type: integer
+        minimum: 1
+        maximum: 64
+        example: 1
+      minGpu:
+        description: |
+          Minimum number of GPUs available.
+        type: number
+        format: double
+        minimum: 0.0
+        maximum: 8.0
+        example: 1.0
+      maxGpu:
+        description: |
+          Maximum number of GPUs available.
+        type: number
+        format: double
+        minimum: 0.0
+        maximum: 8.0
+        example: 2.0
+      diskPerformance:
+        type: string
+        description: |
+          The filtered vm sizes will support at least one of the classes from this list.
+        enum: [ "Standard", "Premium" ]
+        example: Standard
+      acceleratedNetworking:
+        type: string
+        description: |
+          In case acceleratedNetworking is set to Enabled, accelerated networking applies only to the VM that enables it.
+        enum: [ "Enabled", "Disabled" ]
+        example: Enabled
+      minNICs:
+        description: |
+          Minimum number of network interfaces.
+        type: integer
+        minimum: 1
+        maximum: 16
+        example: 4
+      vmTypes:
+        type: array
+        description: |
+          The filtered vm types will belong to one of the vm types from this list.
+        items:
+          type: string
+          enum: [ "generalPurpose", "memoryOptimized", "computeOptimized", "highPerformanceCompute", "storageOptimized", "GPU" ]
+        example: [ "memoryOptimized" ]