Merge pull request #274958 from MicrosoftDocs/main

5/10 11:00 AM IST Publish

Author: Saisang

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md

@@ -225,7 +225,7 @@ Notice the claims transformations we defined in [step 3.2](#step-32---define-cla
 
 Just like in sign-in with a local account, you need to configure the [Microsoft Entra Technical Profiles](active-directory-technical-profile.md), which you use to connect to Microsoft Entra ID storage, to store or read a user social account. 
 
-1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile by using the following code: 
+1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile below it by using the following code: 
 
     ```xml
         <TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -517,6 +517,7 @@ Use the following steps to add a combined local and social account:
     ```xml
         <OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="localIdpAuthentication" AlwaysUseDefaultValue="true" />
     ```
+   Make sure you also add the `authenticationSource` claim in the output claims collection of the `UserSignInCollector` self-asserted technical profile.
 
 1. In the `UserJourneys` section, add a new user journey, `LocalAndSocialSignInAndSignUp` by using the following code: 
 

articles/ai-services/openai/includes/create-resource-portal.md

@@ -89,7 +89,9 @@ As an option, you can add a private endpoint for access to your resource. Select
 
 1. Confirm your configuration settings, and select **Create**.
 
-The Azure portal displays a notification when the new resource is available.
+1. The Azure portal displays a notification when the new resource is available. Select **Go to resource**.
+
+   :::image type="content" source="../media/create-resource/create-resource-go-to-resource.png" alt-text="Screenshot showing the Go to resource button in the Azure portal.":::
 
 ## Deploy a model
 

articles/ai-services/openai/media/create-resource/create-resource-go-to-resource.png

@@ -206,7 +206,7 @@ namespace key_vault_console_app
 
 ## Run the application
 
-Run the application by selecting the **Debug** button at the top of Visual studio. Your key and endpoint secrets will be retrieved from your key vault. 
+Run the application by selecting the **Debug** button at the top of Visual Studio. Your key and endpoint secrets will be retrieved from your key vault. 
 
 ## Send a test Language service call (optional)
 
@@ -376,18 +376,17 @@ In your project, add the following dependencies to your `pom.xml` file.
 
 ```xml
 <dependencies>
-        
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-security-keyvault-secrets</artifactId>
-            <version>4.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.2.0</version>
-        </dependency>
-    </dependencies>
+    <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-security-keyvault-secrets</artifactId>
+        <version>4.2.3</version>
+    </dependency>
+    <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-identity</artifactId>
+        <version>1.2.0</version>
+    </dependency>
+</dependencies>
 ```
 
 ## Import the example code

articles/ai-services/use-key-vault.md

@@ -300,6 +300,8 @@
               href: use-system-pools.md
             - name: Resize node pools
               href: resize-node-pool.md
+            - name: Delete node pools
+              href: delete-node-pool.md
         - name: Virtual nodes
           items:
             - name: Use virtual nodes

articles/aks/TOC.yml

@@ -0,0 +1,106 @@
+---
+title: Delete an Azure Kubernetes Service (AKS) node pool
+description: Learn about deleting a node pool from your Azure Kubernetes Service (AKS) cluster.
+ms.topic: overview
+ms.author: alvinli
+author: alvinli
+ms.date: 05/09/2024
+---
+
+# Delete an Azure Kubernetes Service (AKS) node pool
+
+This article outlines node pool deletion in Azure Kubernetes Service (AKS), including what happens when you delete a node pool and how to delete a node pool.
+
+## What happens when you delete a node pool?
+
+When you delete a node pool, the following resources are deleted:
+
+* The virtual machine scale set (VMSS) and virtual machines (VMs) for each node in the node pool
+* Any node instances in the node pool along with any pods running on those nodes
+
+## Delete a node pool
+
+> [!IMPORTANT]
+> Keep the following information in mind when deleting a node pool:
+>
+> * **You can't recover a node pool after it's deleted**. You need to create a new node pool and redeploy your applications.
+> * When you delete a node pool, AKS doesn't perform cordon and drain. To minimize the disruption of rescheduling pods currently running on the node pool you plan to delete, perform a cordon and drain on all nodes in the node pool before deleting. You can learn more about how to cordon and drain using the example scenario provided in the [resizing node pools][resize-node-pool] tutorial.
+
+### [Azure CLI](#tab/azure-cli)
+
+Delete a node pool using the [`az aks nodepool delete`][az-aks-delete-nodepool] command.
+
+```azurecli-interactive
+az aks nodepool delete \
+    --resource-group <resource-group-name> \
+    --cluster-name <cluster-name> \
+    --name <node-pool-name>
+```
+
+### [Azure PowerShell](#tab/azure-powershell)
+
+Delete a node pool using the [`Remove-AzAksNodePool`][remove-azaksnodepool] cmdlet.
+
+```azurepowershell-interactive
+$params = @{
+    ResourceGroupName = '<resource-group-name>'
+    ClusterName       = '<cluster-name>'
+    Name              = '<node-pool-name>'
+    Force             = $true
+}
+Remove-AzAksNodePool @params
+```
+
+### [Azure portal](#tab/azure-portal)
+
+To delete a node pool in Azure portal, navigate to the **Settings > Node pools** page for the cluster and select the name of the node pool you want to delete. On the **Node Pool | Overview** page, you can select **Delete** to delete the node pool.
+
+---
+
+To verify that the node pool was deleted successfully, use the `kubectl get nodes` command to confirm that the nodes in the node pool no longer exist.
+
+## Ignore PodDisruptionBudgets (PDBs) when removing an existing node pool (Preview)
+
+If your cluster has PodDisruptionBudgets that are preventing the deletion of the node pool, you can ignore the PodDisruptionBudget requirements by setting `--ignore-pod-disruption-budget` to `true`. To learn more about PodDisruptionBudgets, see:
+
+* [Plan for availability using a pod disruption budget][pod-disruption-budget]
+* [Specifying a Disruption Budget for your Application][specify-disruption-budget]
+* [Disruptions][disruptions]
+
+[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
+
+1. Register or update the `aks-preview` extension using the [`az extension add`][az-extension-add] or [`az extension update`][az-extension-update] command.
+
+    ```azurecli-interactive
+    # Register the aks-preview extension
+    az extension add --name aks-preview
+
+    # Update the aks-preview extension
+    az extension update --name aks-preview
+    ```
+
+2. Delete an existing node pool without following any PodDisruptionBudgets set on the cluster using the [`az aks nodepool delete`][az-aks-delete-nodepool] command with the `--ignore-pod-disruption-budget` flag set to `true`:
+
+    ```azurecli-interactive
+    az aks nodepool delete \
+        --resource-group myResourceGroup \
+        --cluster-name myAKSCluster \
+        --name nodepool1
+        --ignore-pod-disruption-budget true
+    ```
+
+3. To verify that the node pool was deleted successfully, use the `kubectl get nodes` command to confirm that the nodes in the node pool no longer exist.
+
+## Next steps
+
+For more information about adjusting node pool sizes in AKS, see [Resize node pools][resize-node-pool].
+
+<!-- LINKS -->
+[az-aks-delete-nodepool]: /cli/azure/aks#az_aks_nodepool_delete
+[remove-azaksnodepool]: /powershell/module/az.aks/remove-azaksnodepool
+[resize-node-pool]: ./resize-node-pool.md
+[pod-disruption-budget]: operator-best-practices-scheduler.md#plan-for-availability-using-pod-disruption-budgets
+[specify-disruption-budget]: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+[disruptions]: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
+[az-extension-add]: /cli/azure/extension#az-extension-add
+[az-extension-update]: /cli/azure/extension#az-extension-update

articles/aks/delete-node-pool.md

@@ -6,7 +6,6 @@ ms.custom: devx-track-azurecli, build-2023
 ms.date: 07/19/2023
 author: schaffererin
 ms.author: schaffererin
-
 ms.subservice: aks-nodes
 ---
 
@@ -187,15 +186,64 @@ AKS offers a separate feature to automatically scale node pools with a feature c
 
 For more information, see [use the cluster autoscaler](cluster-autoscaler.md#use-the-cluster-autoscaler-on-multiple-node-pools).
 
-## Associate capacity reservation groups to node pools 
+## Remove specific VMs in the existing node pool (Preview)
+
+[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
+
+### [Azure CLI](#tab/azure-cli)
+
+1. Register or update the `aks-preview` extension using the [`az extension add`][az-extension-add] or [`az extension update`][az-extension-update] command.
+
+    ```azurecli-interactive
+    # Register the aks-preview extension
+    az extension add --name aks-preview
+
+    # Update the aks-preview extension
+    az extension update --name aks-preview
+    ```
+
+2. List the existing nodes using the `kubectl get nodes` command.
+
+    ```bash
+    kubectl get nodes
+    ```
+
+    Your output should look similar to the following example output:
+
+    ```output
+    NAME                                 STATUS   ROLES   AGE   VERSION
+    aks-mynodepool-20823458-vmss000000   Ready    agent   63m   v1.21.9
+    aks-mynodepool-20823458-vmss000001   Ready    agent   63m   v1.21.9
+    aks-mynodepool-20823458-vmss000002   Ready    agent   63m   v1.21.9
+    ```
+
+3. Delete the specified VMs using the [`az aks nodepool delete-machines`][az-aks-nodepool-delete-machines] command. Make sure to replace the placeholders with your own values.
+
+    ```azurecli-interactive
+    az aks nodepool delete-machines \
+        --resource-group <resource-group-name> \
+        --cluster-name <cluster-name> \
+        --name <node-pool-name>
+        --machine-names <vm-name-1> <vm-name-2>
+    ```
+
+4. Verify the VMs were successfully deleted using the `kubectl get nodes` command.
+
+    ```bash
+    kubectl get nodes
+    ```
+
+    Your output should no longer include the VMs that you specified in the `az aks nodepool delete-machines` command.
+
+## Associate capacity reservation groups to node pools
 
 As your workload demands change, you can associate existing capacity reservation groups to node pools to guarantee allocated capacity for your node pools.  
 
 ## Prerequisites to use capacity reservation groups with AKS
 
-- Use CLI version 2.56 or above and API version 2023-10-01 or higher. 
-- The capacity reservation group should already exist and should contain minimum one capacity reservation, otherwise the node pool is added to the cluster with a warning and no capacity reservation group gets associated. For more information, see [capacity reservation groups][capacity-reservation-groups].
-- You need to create a user-assigned managed identity for the resource group that contains the capacity reservation group (CRG). System-assigned managed identities won't work for this feature. In the following example, replace the environment variables with your own values.
+* Use CLI version 2.56 or above and API version 2023-10-01 or higher.
+* The capacity reservation group should already exist and should contain minimum one capacity reservation, otherwise the node pool is added to the cluster with a warning and no capacity reservation group gets associated. For more information, see [capacity reservation groups][capacity-reservation-groups].
+* You need to create a user-assigned managed identity for the resource group that contains the capacity reservation group (CRG). System-assigned managed identities won't work for this feature. In the following example, replace the environment variables with your own values.
 
     ```azurecli-interactive
     IDENTITY_NAME=myID
@@ -207,14 +255,17 @@ As your workload demands change, you can associate existing capacity reservation
     az identity create --name $IDENTITY_NAME --resource-group $RG_NAME  
     IDENTITY_ID=$(az identity show --name $IDENTITY_NAME --resource-group $RG_NAME --query identity.id -o tsv)
     ```
-- You need to assign the `Contributor` role to the user-assigned identity created above. For more details, see [Steps to assign an Azure role](/azure/role-based-access-control/role-assignments-steps#privileged-administrator-roles).
-- Create a new cluster and assign the newly created identity.
+
+* You need to assign the `Contributor` role to the user-assigned identity created above. For more details, see [Steps to assign an Azure role](/azure/role-based-access-control/role-assignments-steps#privileged-administrator-roles).
+* Create a new cluster and assign the newly created identity.
+
   ```azurecli-interactive
     az aks create --resource-group $RG_NAME --name $CLUSTER_NAME --location $LOCATION \
         --node-vm-size $VM_SKU --node-count $NODE_COUNT \
         --assign-identity $IDENTITY_ID --enable-managed-identity         
   ```
-- You can also assign the user-managed identity on an existing managed cluster with update command.
+
+* You can also assign the user-managed identity on an existing managed cluster with update command.
 
   ```azurecli-interactive
     az aks update --resource-group $RG_NAME --name $CLUSTER_NAME --location $LOCATION \
@@ -541,3 +592,4 @@ When you use an Azure Resource Manager template to create and manage resources,
 [az-extension-add]: /cli/azure/extension#az_extension_add
 [az-extension-update]: /cli/azure/extension#az_extension_update
 [use-node-taints]: ./use-node-taints.md
+[az-aks-nodepool-delete-machines]: /cli/azure/aks/nodepool#az_aks_nodepool_delete_machines