From da11558688648a1628c4ece8def21b2b5e98aaac Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Tue, 13 Oct 2020 14:46:44 -0400 Subject: [PATCH 1/6] Adding new VMSS rolling upgrade properties, enableCrossZoneUpgrade and prioritizeUnhealthyInstances --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index b5feeccd1af2..73f376ab3c5e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9154,6 +9154,16 @@ "pauseTimeBetweenBatches": { "type": "string", "description": "The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S)." + }, + + "enableCrossZoneUpgrade": { + "type": "boolean", + "description": "Enable rolling upgrade across multiple zones during UD walk within the limit of MaxBatchInstanceCount or BatchInstancePercent" + }, + + "prioritizeUnhealthyInstances": { + "type": "boolean", + "description": "Enable rolling upgrade to start with the batch which has most unhealthy VMs in percentage. If enableCrossZoneUpgrade is not enabled, the rolling upgrade will start from the most unhealthy availability zone,and within the zone, walk the UD that has the most unhealhty VMs first" } }, "description": "The configuration parameters used while performing a rolling upgrade." From 02890966cefd4f7382d43c9fcac744f359fdcf6b Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Tue, 13 Oct 2020 23:56:34 -0400 Subject: [PATCH 2/6] remove white spaces --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 73f376ab3c5e..eaaef0cb2c81 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9155,12 +9155,10 @@ "type": "string", "description": "The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S)." }, - "enableCrossZoneUpgrade": { "type": "boolean", "description": "Enable rolling upgrade across multiple zones during UD walk within the limit of MaxBatchInstanceCount or BatchInstancePercent" }, - "prioritizeUnhealthyInstances": { "type": "boolean", "description": "Enable rolling upgrade to start with the batch which has most unhealthy VMs in percentage. If enableCrossZoneUpgrade is not enabled, the rolling upgrade will start from the most unhealthy availability zone,and within the zone, walk the UD that has the most unhealhty VMs first" From 0080e80b27157495ec138fefa3d5d8f47ea01ee5 Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Wed, 11 Nov 2020 10:32:05 -0500 Subject: [PATCH 3/6] modified description --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index c625d73c3497..78db0dd47adf 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9554,11 +9554,11 @@ }, "enableCrossZoneUpgrade": { "type": "boolean", - "description": "Enable rolling upgrade across multiple zones during UD walk within the limit of MaxBatchInstanceCount or BatchInstancePercent" + "description": "Allow VMSS to ignore AZ boundaries when constructing upgrade batches. Take into consideration the Update Domain and maxBatchInstancePercent to determine the batch size." }, "prioritizeUnhealthyInstances": { "type": "boolean", - "description": "Enable rolling upgrade to start with the batch which has most unhealthy VMs in percentage. If enableCrossZoneUpgrade is not enabled, the rolling upgrade will start from the most unhealthy availability zone,and within the zone, walk the UD that has the most unhealhty VMs first" + "description": "Upgrade all unhealthy virtual machine instances in a scale set before any healthy instances." } }, "description": "The configuration parameters used while performing a rolling upgrade." From 8a9920dcd2e71224e6d6d408280d8e4e0dd4bce3 Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Wed, 11 Nov 2020 13:43:14 -0500 Subject: [PATCH 4/6] update description --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 78db0dd47adf..df0ac974d756 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9558,7 +9558,7 @@ }, "prioritizeUnhealthyInstances": { "type": "boolean", - "description": "Upgrade all unhealthy virtual machine instances in a scale set before any healthy instances." + "description": "Upgrade all unhealthy instances in a scale set before any healthy instances." } }, "description": "The configuration parameters used while performing a rolling upgrade." From 4a56666f9ebba4bfec688aec150d89dc0be2759a Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Wed, 9 Dec 2020 23:07:51 -0500 Subject: [PATCH 5/6] add orchestrationMode property to a vmss --- .../stable/2020-12-01/compute.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index c8c2ac2aaba0..8bb02cd5010e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -10022,6 +10022,18 @@ }, "description": "Describes a scale-in policy for a virtual machine scale set." }, + "OrchestrationMode": { + "type": "string", + "description": "Specifies the orchestration mode for the virtual machine scale set.", + "enum": [ + "Uniform", + "Flexible" + ], + "x-ms-enum": { + "name": "OrchestrationMode", + "modelAsAString": true + } + }, "ImageOSDisk": { "properties": { "osType": { @@ -11233,6 +11245,10 @@ "scaleInPolicy": { "$ref": "#/definitions/ScaleInPolicy", "description": "Specifies the scale-in policy that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in." + }, + "orchestrationMode": { + "$ref": "#/definitions/OrchestrationMode", + "description": "Specifies the orchestration mode for the virtual machine scale set." } }, "description": "Describes the properties of a Virtual Machine Scale Set." From 8bb0a63472d18c9942267b190d5b74e8719ac519 Mon Sep 17 00:00:00 2001 From: Kimberly Yip Chang Date: Thu, 10 Dec 2020 00:11:12 -0500 Subject: [PATCH 6/6] update --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 8bb02cd5010e..2a46f2e58382 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -10031,7 +10031,7 @@ ], "x-ms-enum": { "name": "OrchestrationMode", - "modelAsAString": true + "modelAsString": false } }, "ImageOSDisk": {