From 5754c8df1fcb5105ac6da6069bc8ae603c3994f1 Mon Sep 17 00:00:00 2001 From: lionelr Date: Wed, 11 Dec 2024 11:52:53 +0200 Subject: [PATCH 1/2] DOC-2175 - add the option to switch the VM to OD before deleting the stateful node -tests and Deployment --- .../schemas/create/createStatefulNodeStrategy.yaml | 13 +------------ .../stateful/node/schemas/deleteStatefulNode.yaml | 6 ++++++ .../schemas/update/updateStatefulNodeStrategy.yaml | 13 +------------ 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeStrategy.yaml b/api/services/elastigroup/azure/stateful/node/schemas/create/createStatefulNodeStrategy.yaml index bcae8d41c..6f0ba358d 100644 --- 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 \ No newline at end of file + example: 100 \ No newline at end of file diff --git a/api/services/elastigroup/azure/stateful/node/schemas/deleteStatefulNode.yaml b/api/services/elastigroup/azure/stateful/node/schemas/deleteStatefulNode.yaml index 7873841f1..0143e8650 100644 --- 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 \ No newline at end of file diff --git a/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeStrategy.yaml b/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeStrategy.yaml index dda7339c6..60e457de9 100644 --- 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 \ No newline at end of file + example: 100 \ No newline at end of file From a21dced4d012223d0d1114d5b5d0e95f44c9fba1 Mon Sep 17 00:00:00 2001 From: lionelr Date: Wed, 11 Dec 2024 13:25:39 +0200 Subject: [PATCH 2/2] DOC-2175 - add the option to switch the VM to OD before deleting the stateful node -tests and Deployment --- .../schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml | 2 +- .../azure/stateful/node/schemas/attachDataDisk/disk.yaml | 2 +- .../stateful/node/schemas/create/createStatefulNodeCompute.yaml | 2 +- .../stateful/node/schemas/update/updateStatefulNodeCompute.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/services/elastigroup/azure/stateful/node/schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml b/api/services/elastigroup/azure/stateful/node/schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml index abf6f4f50..3b837d51f 100644 --- a/api/services/elastigroup/azure/stateful/node/schemas/attachDataDisk/attachDataDiskToStatefulNode.yaml +++ b/api/services/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 index e855d9783..d61990df0 100644 --- 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 index 54a521197..ae0fb0f4e 100644 --- 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/update/updateStatefulNodeCompute.yaml b/api/services/elastigroup/azure/stateful/node/schemas/update/updateStatefulNodeCompute.yaml index 68bea2cac..14d25e3fe 100644 --- 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