Merge branch 'master' into SPOTAUT-17605-Fix

spotinst · Feb 6, 2024 · 7757786 · 7757786
2 parents 0e24f76 + 61e6644
commit 7757786
Show file tree

Hide file tree

Showing 31 changed files with 329 additions and 34 deletions.
diff --git a/api/services/elastigroup/aws/responses/elastigroup-deployment-status.yaml b/api/services/elastigroup/aws/responses/elastigroup-deployment-status.yaml
@@ -75,27 +75,47 @@ content:
                           progress:
                             unit: percent
                             value: 0
+                          currentBatch: 1,
+                          numOfBatches: 4
+                          gracePeriod: 900
+                          blueInstances: 4
+                          greenInstances: 1
                           createdAt: 2018-03-27T19:50:12.000+0000
                           updatedAt: 2018-03-27T19:50:16.000+0000
                         - id: sbgd-3ee19606
                           status: stopped
                           progress:
                             unit: percent
                             value: 0
+                          currentBatch: 1,
+                          numOfBatches: 4
+                          gracePeriod: 900
+                          blueInstances: 4
+                          greenInstances: 1
                           createdAt: 2018-03-27T19:35:41.000+0000
                           updatedAt: 2018-03-27T19:39:18.000+0000
                         - id: sbgd-cc4c44e2
                           status: finished
                           progress:
                             unit: percent
                             value: 100
+                          currentBatch: 1,
+                          numOfBatches: 4
+                          gracePeriod: 900
+                          blueInstances: 4
+                          greenInstances: 1
                           createdAt: 2018-03-26T19:22:45.000+0000
                           updatedAt: 2018-03-26T19:26:17.000+0000
                         - id: sbgd-3f127ed0
                           status: starting
                           progress:
                             unit: percent
                             value: 0
+                          currentBatch: 1,
+                          numOfBatches: 4
+                          gracePeriod: 900
+                          blueInstances: 4
+                          greenInstances: 1
                           createdAt: 2018-03-27T19:46:22.000+0000
                           updatedAt: 2018-03-27T19:46:35.000+0000
                     count:

diff --git a/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example2.yaml b/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example2.yaml
@@ -20,6 +20,26 @@ properties:
         type: integer
         title: Value
         example: 0
+  currentBatch:
+    type: integer
+    title: Current Batch
+    example: 1
+  numOfBatches:
+    type: integer
+    title: Number of Batches
+    example: 4
+  gracePeriod:
+    type: integer
+    title: Grace Period
+    example: 900
+  blueInstances:
+    type: integer
+    title: Blue Instances
+    example: 4
+  greenInstances:
+    type: integer
+    title: Green Instances
+    example: 1
   createdAt:
     type: string
     title: Created At

diff --git a/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example3.yaml b/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example3.yaml
@@ -19,6 +19,26 @@ properties:
         type: integer
         title: Value
         example: 0
+  currentBatch:
+    type: integer
+    title: Current Batch
+    example: 1
+  numOfBatches:
+    type: integer
+    title: Number of Batches
+    example: 4
+  gracePeriod:
+    type: integer
+    title: Grace Period
+    example: 900
+  blueInstances:
+    type: integer
+    title: Blue Instances
+    example: 4
+  greenInstances:
+    type: integer
+    title: Green Instances
+    example: 1
   createdAt:
     type: string
     title: Created At

diff --git a/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example4.yaml b/api/services/elastigroup/aws/schemas/elastigroup-deployment-status-example4.yaml
@@ -19,6 +19,26 @@ properties:
         type: integer
         title: Value
         example: 100
+  currentBatch:
+    type: integer
+    title: Current Batch
+    example: 1
+  numOfBatches:
+    type: integer
+    title: Number of Batches
+    example: 4
+  gracePeriod:
+    type: integer
+    title: Grace Period
+    example: 900
+  blueInstances:
+    type: integer
+    title: Blue Instances
+    example: 4
+  greenInstances:
+    type: integer
+    title: Green Instances
+    example: 1
   createdAt:
     type: string
     title: Created At

diff --git a/api/services/elastigroup/aws/schemas/elastigroup-deployment-status.yaml b/api/services/elastigroup/aws/schemas/elastigroup-deployment-status.yaml
@@ -19,6 +19,26 @@ properties:
         type: integer
         title: Value
         example: 0
+  currentBatch:
+    type: integer
+    title: Current Batch
+    example: 1
+  numOfBatches:
+    type: integer
+    title: Number of Batches
+    example: 4
+  gracePeriod:
+    type: integer
+    title: Grace Period
+    example: 900
+  blueInstances:
+    type: integer
+    title: Blue Instances
+    example: 4
+  greenInstances:
+    type: integer
+    title: Green Instances
+    example: 1
   createdAt:
     type: string
     title: Created At

diff --git a/api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml b/api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml
@@ -106,4 +106,12 @@ properties:
         items:
           type: string
           enum: [ "generalPurpose", "memoryOptimized", "computeOptimized", "highPerformanceCompute", "storageOptimized", "GPU" ]
-        example: [ "memoryOptimized" ]
+        example: [ "memoryOptimized" ]
+      gpuTypes:
+        type: array
+        description: |
+          The filtered gpu types will belong to one of the gpu types from this list.
+        items:
+          type: string
+          enum: [ "nvidia-tesla-v100", "amd-radeon-instinct-mi25", "nvidia-a10", "nvidia-tesla-a100", "nvidia-tesla-k80", "nvidia-tesla-m60", "nvidia-tesla-p100", "nvidia-tesla-p40", "nvidia-tesla-t4", "nvidia-tesla-h100"]
+          example: [ "nvidia-tesla-t4" ]
diff --git a/api/services/ocean/cd/schemas/oceanCDArgoRolloutsInfo.yaml b/api/services/ocean/cd/schemas/oceanCDArgoRolloutsInfo.yaml
@@ -0,0 +1,12 @@
+type: object
+title: Argo Rollouts Metadata
+description: >
+  Contains Argo Rollouts metadata information.
+properties:
+  argoRolloutVersion:
+    type: string
+  lastHeartbeatTime:
+    type: string
+    example: "2018-11-05T12:55:50.000Z"
+    description: >
+      Time stamp of latest time the operator controller sent heartbeat.
diff --git a/api/services/ocean/cd/schemas/oceanCDCluster.yaml b/api/services/ocean/cd/schemas/oceanCDCluster.yaml
@@ -7,9 +7,21 @@ properties:
     example: "2018-11-05T12:55:50.000Z"
     description: >
       Time stamp of latest time the controller sent heartbeat.
-  controllerInfo:
-    type: object
-    $ref: "../schemas/oceanCDControllerInfo.yaml"
   clusterInfo:
     type: object
-    $ref: "../schemas/oceanCDClusterInfo.yaml"
+    $ref: "../schemas/oceanCDClusterInfo.yaml"
+  operatorInfo:
+    type: object
+    $ref: "../schemas/oceanCDOperatorInfo.yaml"
+  operatorMetadata:
+    type: object
+    $ref: "../schemas/oceanCDOperatorMetadata.yaml"
+  omInfo:
+    type: object
+    $ref: "../schemas/oceanCDOMInfo.yaml"
+  omMetadata:
+    type: object
+    $ref: "../schemas/oceanCDOMMetadata.yaml"
+  argoRolloutInfo:
+    type: object
+    $ref: "../schemas/oceanCDArgoRolloutsInfo.yaml"
diff --git a/api/services/ocean/cd/schemas/oceanCDClusterInfo.yaml b/api/services/ocean/cd/schemas/oceanCDClusterInfo.yaml
@@ -1,7 +1,7 @@
 type: object
 title: Ocean CD Cluster Info
 description: >
-  Contains cluster detailed information.
+  Contains OceanCD cluster detailed information.
 properties:
   kubernetesVersion:
     type: string

diff --git a/api/services/ocean/cd/schemas/oceanCDOMInfo.yaml b/api/services/ocean/cd/schemas/oceanCDOMInfo.yaml
@@ -0,0 +1,13 @@
+type: object
+title: Ocean CD Operator Manager Info
+description: >
+  Contains OceanCD operator manager detailed information.
+properties:
+  kubernetesVersion:
+    type: string
+  nodeName:
+    type: string
+  operatorVersion:
+    type: string
+  podName:
+    type: string
diff --git a/api/services/ocean/cd/schemas/oceanCDOMMetadata.yaml b/api/services/ocean/cd/schemas/oceanCDOMMetadata.yaml
@@ -0,0 +1,10 @@
+type: object
+title: Ocean CD Operator Maanager Metadata
+description: >
+  Contains OceanCD operator manager metadata information.
+properties:
+  lastHeartbeatTime:
+    type: string
+    example: "2018-11-05T12:55:50.000Z"
+    description: >
+      Time stamp of latest time the operator manager controller sent heartbeat.
diff --git a/...ean/cd/schemas/oceanCDControllerInfo.yaml → ...ocean/cd/schemas/oceanCDOperatorInfo.yaml b/...ean/cd/schemas/oceanCDControllerInfo.yaml → ...ocean/cd/schemas/oceanCDOperatorInfo.yaml
@@ -1,8 +1,10 @@
 type: object
-title: Ocean CD Controller Info
+title: Ocean CD Operator Info
 description: >
-  Contains controller detailed information.
+  Contains OceanCD operator detailed information.
 properties:
+  kubernetesVersion:
+    type: string
   nodeName:
     type: string
   operatorVersion:

diff --git a/api/services/ocean/cd/schemas/oceanCDOperatorMetadata.yaml b/api/services/ocean/cd/schemas/oceanCDOperatorMetadata.yaml
@@ -0,0 +1,10 @@
+type: object
+title: Ocean CD Operator Metadata
+description: >
+  Contains OceanCD operator metadata information.
+properties:
+  lastHeartbeatTime:
+    type: string
+    example: "2018-11-05T12:55:50.000Z"
+    description: >
+      Time stamp of latest time the operator controller sent heartbeat.
diff --git a/api/services/ocean/cd/schemas/oceanCDRolloutStatus.yaml b/api/services/ocean/cd/schemas/oceanCDRolloutStatus.yaml
@@ -17,4 +17,5 @@ enum:
   - aborting
   - aborted
   - failurePolicyPausing
-  - failurePolicyPaused
+  - failurePolicyPaused
+  - rolloutInterrupted
diff --git a/api/services/ocean/ecs/paths/cluster-launchSpecs.yaml b/api/services/ocean/ecs/paths/cluster-launchSpecs.yaml
@@ -29,6 +29,13 @@ get:
     - "Ocean ECS"
   parameters:
     - $ref: "../../../../commons/parameters/accountId.yaml"
+    - in: query
+      name: oceanId
+      schema:
+        type: string
+      example: o-12345abc
+      description: >
+        Identifier of the Ocean cluster.
   responses:
     200:
       $ref: "../responses/oceanLaunchSpecList.yaml"

diff --git a/api/services/ocean/ecs/paths/cluster.yaml b/api/services/ocean/ecs/paths/cluster.yaml
@@ -32,7 +32,7 @@ put:
       application/json:
         schema:
           allOf:
-          - $ref: "../schemas/ocean.yaml"
+          - $ref: "../schemas/ocean-update.yaml"
   responses:
     200:
       $ref: "../responses/ocean.yaml"

diff --git a/api/services/ocean/ecs/paths/clusters.yaml b/api/services/ocean/ecs/paths/clusters.yaml
@@ -28,7 +28,7 @@ post:
       application/json:
         schema:
           allOf:
-            - $ref: "../schemas/ocean.yaml"
+            - $ref: "../schemas/ocean-create.yaml"
   responses:
     200:
       $ref: "../responses/ocean.yaml"

diff --git a/api/services/ocean/ecs/paths/detachInstances.yaml b/api/services/ocean/ecs/paths/detachInstances.yaml
@@ -0,0 +1,23 @@
+put:
+  summary: "Detach Instances"
+  description: >
+    Detach instances from your Ocean cluster.
+  operationId: "oceanEcsDetachInstance"
+  tags:
+    - "Ocean ECS"
+  parameters:
+    - $ref: "../../../../commons/parameters/accountId.yaml"
+    - $ref: "../../commons/parameters/oceanId.yaml"
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          allOf:
+            - $ref: "../../aws/schemas/detachInstancesRequest.yaml"
+  responses:
+    200:
+      $ref: "../responses/detachInstancesResponse.yaml"
+    400:
+      description: "Bad Request"
+
diff --git a/api/services/ocean/ecs/responses/detachInstancesResponse.yaml b/api/services/ocean/ecs/responses/detachInstancesResponse.yaml
@@ -0,0 +1,15 @@
+description: Detach Instances Response
+content:
+  application/json:
+    schema:
+      allOf:
+        - $ref: "../../../../commons/schemas/responseWrapper.yaml"
+        - type: object
+          properties:
+            request:
+              type: object
+              properties:
+                url:
+                  example: "/ocean/aws/ecs/cluster/o-abcd1234/detachInstances"
+                method:
+                  example: "PUT"
diff --git a/api/services/ocean/ecs/responses/ocean.yaml b/api/services/ocean/ecs/responses/ocean.yaml
@@ -12,6 +12,6 @@ content:
                 items:
                   type: array
                   items:
-                    $ref: "../schemas/ocean.yaml"
+                    $ref: "../schemas/ocean-update.yaml"
                 kind:
                   example: "spotinst:ocean:aws:ecs"
diff --git a/api/services/ocean/ecs/schemas/OceanLaunchSpecLaunchContainerInstancesRequest.yaml b/api/services/ocean/ecs/schemas/OceanLaunchSpecLaunchContainerInstancesRequest.yaml
@@ -1,4 +1,6 @@
 type: object
+required:
+  - launchRequest
 properties:
   launchRequest:
     type: object

diff --git a/api/services/ocean/ecs/schemas/launchSpec-blockDeviceMappings.yaml b/api/services/ocean/ecs/schemas/launchSpec-blockDeviceMappings.yaml
@@ -56,6 +56,7 @@ items:
         required:
           - baseSize
           - resource
+          - sizePerResourceUnit
         description: >
           Set dynamic volume size properties. When using this object, you cannot use volumeSize. You must use one or the other.
         properties: