Merge pull request #278477 from mimckitt/reverting-changes

Adding Upgrade Policy Changes back

Author: JamesJBarnett

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-change-upgrade-policy.md

@@ -1,27 +1,30 @@
 ---
-title: Change the upgrade policy on Virtual Machine Scale Sets
+title: Change the upgrade policy on Virtual Machine Scale Sets (Preview)
 description: Learn how to change the upgrade policy on Virtual Machine Scale Sets
 author: mimckitt
 ms.author: mimckitt
 ms.topic: how-to
 ms.service: virtual-machine-scale-sets
-ms.date: 06/14/2024
+ms.date: 6/6/2024
 ms.reviewer: ju-shim
 ms.custom: upgradepolicy
 ---
-# Change the upgrade policy on Virtual Machine Scale Sets
+# Change the upgrade policy on Virtual Machine Scale Sets (Preview)
 
 > [!NOTE]
-> Automatic, manual and rolling upgrade policy is available for Virtual Machine Scale sets with Uniform Orchestration. 
+> Automatic, manual and rolling upgrade policy for Virtual Machine Scale Sets with Uniform Orchestration are in general availability (GA) . 
 >
->**Only manual upgrade policy is available for Virtual Machine scale Sets with Flexible Orchestration. Manual upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration is currently in preview.**. Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA).
+>**Automatic, manual and rolling upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration are currently in preview.** Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA).
 
 The upgrade policy for a Virtual Machine Scale Set can be changed at any point in time. Depending on your scenario, you may want to use a particular upgrade policy when setting up and developing your workload and once you're ready to move to production, change it to another upgrade policy mode. 
 
 ### [Portal](#tab/portal)
 
 Select the Virtual Machine Scale Set you want to change the upgrade policy for. In the menu under **Settings**, select **Upgrade Policy** and from the drop-down menu, select the upgrade policy you want to enable. 
 
+> [!NOTE]
+> Setting or changing the upgrade policy to automatic in the Azure Portal on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set or change the upgrade policy to automatic, use CLI, PowerShell, ARM Template, or any other SDK. 
+
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for more configuration options and suggestions.
 
 :::image type="content" source="../virtual-machine-scale-sets/media/upgrade-policy/change-upgrade-policy.png" alt-text="Screenshot showing changing the upgrade policy and enabling MaxSurge in the Azure portal.":::
@@ -35,7 +38,7 @@ If using a rolling upgrade policy, see [configure rolling upgrade policy](virtua
 az vmss update \
     --name myScaleSet \
     --resource-group myResourceGroup \
-    --set upgradePolicy.mode=manual
+    --set upgradePolicy.mode=Automatic
 ```
 
 ### [PowerShell](#tab/powershell)
@@ -63,7 +66,7 @@ If using a rolling upgrade policy, see [configure rolling upgrade policy](virtua
 ```ARM
 "properties": {
         "upgradePolicy": {
-            "mode": "manual",
+            "mode": "automatic",
         }
     }
 ```

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-configure-rolling-upgrades.md

@@ -1,36 +1,52 @@
 ---
-title: Configure rolling upgrades on Virtual Machine Scale Sets
+title: Configure rolling upgrades on Virtual Machine Scale Sets (Preview)
 description: Learn about how to configure rolling upgrades on Virtual Machine Scale Sets.
 author: mimckitt
 ms.author: mimckitt
 ms.topic: how-to
 ms.service: virtual-machine-scale-sets
-ms.date: 06/14/2024
+ms.date: 6/14/2024
 ms.reviewer: ju-shim
 ms.custom: upgradepolicy, devx-track-azurepowershell
 ---
-# Configure rolling upgrades on Virtual Machine Scale Sets
+# Configure rolling upgrades on Virtual Machine Scale Sets (Preview)
 
 > [!NOTE]
-> Rolling upgrade policy is only available for Virtual Machine Scale Sets with Uniform Orchestration.
+> Rolling upgrade policy for Virtual Machine Scale sets with Uniform Orchestration is in general availability (GA) . 
+>
+> **Rolling upgrade policy for Virtual Machine scale Sets with Flexible Orchestration is currently in preview.** 
+>
+> **MaxSurge for Virtual Machine Scale Sets with Flexible Orchestration and Uniform Orchestration is currently in preview.**
+>
+> Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA). 
+
+
 
 Rolling upgrade policy is the safest way to apply updates to instances in a Virtual Machine Scale Set. Performing updates in batches ensures that your scale set maintains a set number of instances available to take traffic, meaning you don't need to take down your entire workload to make a change. 
 
 Rolling upgrade policy is best suited for production workloads.
 
+## Prerequisites 
+
+Before configuring a rolling upgrade policy on a Virtual Machine Scale Set with Flexible Orchestration or enabling MaxSurge on either Flexible or Uniform Orchestration deployments, register the feature providers to your subscription.
+
+## Feature Registration
+
+```azurepowershell-interactive
+Register-AzProviderFeature -FeatureName VMSSFlexRollingUpgrade -ProviderNameSpace Microsoft.Compute
+
+Register-AzProviderFeature -FeatureName MaxSurgeRollingUpgrade -ProviderNamespace Microsoft.Compute
+```
+
 
 ## Requirements
 
-- If using a rolling upgrade policy, the scale set must have a [health probe](../load-balancer/load-balancer-custom-probe-overview.md) or use the [Application Health Extension](virtual-machine-scale-sets-health-extension.md) to monitor application health. 
+- When using a rolling upgrade policy on Virtual Machine Scale Sets with Flexible Orchestration, the scale set must also use the [Application Health Extension](virtual-machine-scale-sets-health-extension.md) to monitor application health.
 
-- If using rolling upgrades with MaxSurge, new VMs are created using the latest scale set model to replace VMs using the old scale set model. These newly created VMs have new instance Ids and IP addresses. Ensure you have enough quota and address space in your subnet to accommodate these new VMs before enabling MaxSurge. For more information on quotas and limits, see [Azure subscription and service limits](../azure-resource-manager/management/azure-subscription-service-limits.md).
+- When using a rolling upgrade policy on Virtual Machine Scale Sets with Uniform Orchestration, the scale set must also have a [health probe](../load-balancer/load-balancer-custom-probe-overview.md) or use the [Application Health Extension](virtual-machine-scale-sets-health-extension.md) to monitor application health. 
+
+- When using rolling upgrades with MaxSurge, new VMs are created using the latest scale set model to replace VMs using the old scale set model. These newly created VMs have new instance Ids and IP addresses. Ensure you have enough quota and address space in your subnet to accommodate these new VMs before enabling MaxSurge. For more information on quotas and limits, see [Azure subscription and service limits](../azure-resource-manager/management/azure-subscription-service-limits.md).
 
->[!IMPORTANT]
-> MaxSurge is currently in preview for Virtual Machine Scale Sets. To use this preview feature, register the provider feature using Azure Cloud Shell. 
->
-> `Register-AzProviderFeature -FeatureName MaxSurgeRollingUpgrade -ProviderNamespace Microsoft.Compute`
->
->Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA). 
 
 ## Concepts
 
@@ -43,12 +59,12 @@ Rolling upgrade policy is best suited for production workloads.
 | **Max unhealthy upgrade %**| Specifies the total number of instances allowed to be marked as unhealthy after being upgraded. <br><br>Example: A max unhealthy upgrade % of 20 means if you have a scale set of 10 instances and more than two instances in the entire scale set report back as unhealthy after being upgraded, the rolling upgrade is canceled. <br><br>Max unhealthy upgrade % is an important setting because it allows the scale set to catch unstable or poor updates before they roll out to the entire scale set. |
 |**Prioritize unhealthy instances** | Tells the scale set to upgrade instances marked as unhealthy before upgrading instances marked as healthy. <br><br>Example: If some instances in your scale set that show as failed or unhealthy when a rolling upgrade begins, the scale set updates those instances first. |
 | **Enable cross-zone upgrade** | Allows the scale set to ignore Availability Zone boundaries when determining batches. |
-| **MaxSurge** | MaxSurge is currently in preview for Virtual Machine Scale Sets Uniform Orchestration. To use this preview feature, register the provider feature using `Register-AzProviderFeature -FeatureName MaxSurgeRollingUpgrade -ProviderNamespace Microsoft.Compute`.<br><br> With MaxSurge enabled, new instances are created  in batches using the latest scale model. Once the batch of new instances are successfully created and marked as healthy, they begin taking traffic. The scale set then deletes instances in batches matching the old scale set model. This continues until all instances are brought up-to-date. rolling upgrades with MaxSurge can help improve service uptime during upgrade events. <br><br>With MaxSurge disabled, the existing instances in a scale set are brought down in batches to be upgraded. Once the upgraded batch is complete, the instances begin taking traffic again, and the next batch begins. This continues until all instances brought up-to-date. |
+| **MaxSurge (Preview)** | With MaxSurge enabled, new instances are created  in batches using the latest scale model. Once the batch of new instances are successfully created and marked as healthy, they begin taking traffic. The scale set then deletes instances in batches matching the old scale set model. This continues until all instances are brought up-to-date. rolling upgrades with MaxSurge can help improve service uptime during upgrade events. <br><br>With MaxSurge disabled, the existing instances in a scale set are brought down in batches to be upgraded. Once the upgraded batch is complete, the instances begin taking traffic again, and the next batch begins. This continues until all instances brought up-to-date. |
 
 
 ## Setting or updating the rolling upgrade policy
 
-Rolling upgrade policy can be configured during scale set creation. Because Rolling upgrade policy requires successfully monitoring application health and there are specific settings that determine how upgrades are completed, it's suggested to first create your scale set using manual upgrade policy. Once you have confirmed the application health is being successfully reported, update your upgrade policy from manual to Rolling.
+Rolling upgrade policy can be configured during scale set creation. Because rolling upgrade policy requires successfully monitoring application health and there are specific settings that determine how upgrades are completed, it's suggested to first create your scale set using manual upgrade policy. Once you have confirmed the application health is being successfully reported, update your upgrade policy from manual to rolling.
 
 ### [Portal](#tab/portal1)
 
@@ -95,7 +111,7 @@ Update-Azvmss -ResourceGroupName "myResourceGroup" `
 
 ### [ARM Template](#tab/template1)
 
-Update the properties section of your ARM template and set the upgrade policy to Rolling and various rolling upgrade options.  
+Update the properties section of your ARM template and set the upgrade policy to rolling and various rolling upgrade options.  
 
 
 ``` ARM Template

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-perform-manual-upgrades.md

@@ -1,20 +1,20 @@
 ---
-title: Performing manual upgrades on Virtual Machine Scale Sets
+title: Performing manual upgrades on Virtual Machine Scale Sets (Preview)
 description: Learn about how to perform a manual upgrade on Virtual Machine Scale Sets.
 author: mimckitt
 ms.author: mimckitt
 ms.topic: how-to
 ms.service: virtual-machine-scale-sets
-ms.date: 06/14/2024
+ms.date: 6/14/2024
 ms.reviewer: ju-shim
 ms.custom: upgradepolicy
 ---
-# Performing manual upgrades on Virtual Machine Scale Sets
+# Performing manual upgrades on Virtual Machine Scale Sets (Preview)
 
 > [!NOTE]
-> Manual upgrade policy is available for both Virtual Machine Scale Sets with Uniform Orchestration and Virtual Machine Scale Sets with Flexible Orchestration. 
+> Manual upgrade policy for Virtual Machine Scale Sets with Uniform Orchestration is in general availability (GA) .
 >
->**Manual upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration is currently in preview**. Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA). 
+>**Manual upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration is currently in preview.** Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA). 
  
 If you have the upgrade policy set to manual, any changes made to the scale set model won't be applied automatically. You need to manually trigger upgrades on each individual virtual machine. The manual upgrade functionality updates the selected instances according to the virtual machine configuration set in the scale set profile.
 

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-reimage-virtual-machine.md

@@ -5,7 +5,7 @@ author: mimckitt
 ms.author: mimckitt
 ms.topic: how-to
 ms.service: virtual-machine-scale-sets
-ms.date: 06/14/2024
+ms.date: 02/06/2024
 ms.reviewer: ju-shim
 ms.custom: upgradepolicy
 

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-set-upgrade-policy.md

@@ -1,35 +1,38 @@
 ---
-title: Set the upgrade policy on Virtual Machine Scale Sets
+title: Set the upgrade policy on Virtual Machine Scale Sets (Preview)
 description: Learn about to set the upgrade policy on Virtual Machine Scale Sets
 author: mimckitt
 ms.author: mimckitt
 ms.topic: how-to
 ms.service: virtual-machine-scale-sets
-ms.date: 06/14/2024
+ms.date: 6/6/2024
 ms.reviewer: ju-shim
 ms.custom: upgradepolicy
 ---
-# Set the upgrade policy on Virtual Machine Scale Sets
+# Set the upgrade policy on Virtual Machine Scale Sets (Preview)
 
 > [!NOTE]
-> Automatic, manual and rolling upgrade policy are available for Virtual Machine Scale Sets with Uniform Orchestration. 
+> Automatic, manual and rolling upgrade policy for Virtual Machine Scale Sets with Uniform Orchestration are in general availability (GA) . 
 >
->**Only manual upgrade policy is available for Virtual Machine scale Sets with Flexible Orchestration. Manual upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration is currently in preview**. Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA).
+>**Automatic, manual and rolling upgrade policy for Virtual Machine Scale Sets with Flexible Orchestration are currently in preview.** Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA).
 
 The upgrade policy can be set during scale set creation or changed post deployment. If you don't explicitly set the upgrade policy, it defaults to manual. To change the upgrade policy of an existing scale set deployment, see [changing the upgrade policy](virtual-machine-scale-sets-change-upgrade-policy.md).
 
 ### [Portal](#tab/portal)
 
 During the Virtual Machine Scale Set creation in the Azure portal, under the **Management** tab, set the upgrade policy to **Rolling**, **Automatic**, or **Manual**. 
 
+> [!NOTE]
+> Setting or changing the upgrade policy to automatic in the Azure Portal on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set or change the upgrade policy to automatic, use CLI, PowerShell, ARM Template, or any other SDK. 
+
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
 
 :::image type="content" source="../virtual-machine-scale-sets/media/upgrade-policy/pick-upgrade-policy.png" alt-text="Screenshot showing deploying a scale set and enabling MaxSurge.":::
 
 ### [CLI](#tab/cli)
 When creating a new scale set using Azure CLI, use [az vmss create](/cli/azure/vmss#az-vmss-create) and the `-upgrade-policy-mode` to set the upgrade policy mode.  
 
-If using a rolling upgrade policy, see [Configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
+If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
 
 ```azurecli-interactive
 az vmss create \
@@ -38,7 +41,7 @@ az vmss create \
     --orchestration-mode Flexible \
     --image Ubuntu2204 \
     --lb myLoadBalancer \
-    --upgrade-policy-mode Manual \
+    --upgrade-policy-mode automatic \
     --instance-count 5 \
     --admin-username azureuser \
     --generate-ssh-keys
@@ -65,12 +68,12 @@ New-AzVmss `
 ### [ARM Template](#tab/template)
 When using an ARM template, add the `upgradePolicy` parameter to the properties section of your template to set the upgrade policy mode. 
 
-If using a rolling upgrade policy, see [configure Rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
+If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
 
 ```ARM
 "properties": {
         "upgradePolicy": {
-            "mode": "Manual",
+            "mode": "Automatic",
         }
     }
 ```