Merge branch 'master' into DOC-2159-BE-GKE-Expose-Auto-Update

spotinst · Dec 18, 2024 · 3c90bf6 · 3c90bf6
2 parents b862b3e + d48a46e
commit 3c90bf6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 28 deletions.
diff --git a/.github/workflows/pr-jira-validation.yaml b/.github/workflows/pr-jira-validation.yaml
@@ -42,6 +42,7 @@ jobs:
           echo "ACTOR_LOGIN - $ACTOR_LOGIN"
           if [ "$ACTOR_LOGIN" != "jira[bot]" ]; then
             echo "Branch was not created by jira[bot]."
+            # exit 1
           fi
 
       - name: Validate PR body for Jira ticket link

diff --git a/.../elastigroup/azure/stateful/node/schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml b/.../elastigroup/azure/stateful/node/schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml
@@ -34,7 +34,7 @@ properties:
     type: string
     description: |
       The type of the data disk.
-    enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
+    enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS]
     example: "Standard_LRS"
   zone:
     type: string

diff --git a/api/services/elastigroup/azure/stateful/node/schemas/attachDataDisk/disk.yaml b/api/services/elastigroup/azure/stateful/node/schemas/attachDataDisk/disk.yaml
@@ -36,7 +36,7 @@ properties:
     type: string
     description: |
       The type of the disk.
-    enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
+    enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS ]
     example: "Standard_LRS"
   managedBy:
     type: string

diff --git a/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeCompute.yaml b/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeCompute.yaml
@@ -628,7 +628,7 @@ properties:
               type: string
               description: |
                 The type of the data disk.
-              enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
+              enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS]
               example: "Standard_LRS"
             caching:
               type: string

diff --git a/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeStrategy.yaml b/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeStrategy.yaml
@@ -136,15 +136,4 @@ properties:
     description: |
       Set the desired preference for the Spot market VM selection. (100-  Availability, 0- cost)
     type: integer
-    example: 100
-  vmAdmins:
-    type: array
-    description: |
-      * A list of strings. Defines Azure identities that are considered VM admins.
-      * If the list is empty, the defined behavior is "NONE".
-      * If the list is null, the defined behavior is "ALL”. This applies if the object is not defined.
-      * If an identity **contains** the string, it will be considered permitted to perform the following actions:
-      * Stop VM: VM admins can move the VM to a "stopped (deallocated)" state using the Azure console. If triggered by someone else, it is considered an interruption.
-    example: [ "@example1.com","@example2.com","service1" ]
-    items:
-      type: string
+    example: 100
diff --git a/api/services/elastigroup/azure/stateful/node/schemas/deleteStatefulNode.yaml b/api/services/elastigroup/azure/stateful/node/schemas/deleteStatefulNode.yaml
@@ -103,3 +103,9 @@ properties:
             minimum: 0
             maximum: 371
             default: 96
+      shouldRevertToOd:
+       type: boolean
+       default: false
+       description: |
+        Indicates whether to change the stateful node's VM lifecycle to on-demand. Can be changed to true only when shouldTerminateVms is 'false'.
+       example: false
diff --git a/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeCompute.yaml b/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeCompute.yaml
@@ -599,7 +599,7 @@ properties:
               type: string
               description: |
                 The type of the data disk
-              enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
+              enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS ]
               example: "Standard_LRS"
             caching:
               type: string

diff --git a/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeStrategy.yaml b/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeStrategy.yaml
@@ -136,15 +136,4 @@ properties:
     description: |
       Set the desired preference for the Spot market VM selection. (100-  Availability, 0- cost)
     type: integer
-    example: 100
-  vmAdmins:
-    type: array
-    description: |
-      * A list of strings. Defines Azure identities that are considered VM admins.
-      * If the list is empty, the defined behavior is "NONE".
-      * If the list is null, the defined behavior is "ALL”. This applies if the object is not defined.
-      * If an identity **contains** the string, it will be considered permitted to perform the following actions:
-      * Stop VM: VM admins can move the VM to a "stopped (deallocated)" state using the Azure console. If triggered by someone else, it is considered an interruption.
-    example: [ "@example1.com","@example2.com","service1" ]
-    items:
-      type: string
+    example: 100