fix conflicts

Author: asudbring

.openpublishing.redirection.json

@@ -43303,6 +43303,11 @@
       "source_path_from_root": "/articles/virtual-network/nat-gateway/tutorial-create-nat-gateway-cli.md",
       "redirect_url": "/azure/virtual-network/nat-gateway/quickstart-create-nat-gateway-cli",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/aks/web-app-routing.md",
+      "redirect_url": "/azure/aks/intro-kubernetes",
+      "redirect_document_id":false
     }
   ]
 }

articles/active-directory/hybrid/how-to-connect-fed-group-claims.md

@@ -252,12 +252,12 @@ Emit group names to be returned in `NetbiosDomain\sAMAccountName` format as the
 "optionalClaims": {
     "saml2Token": [{
         "name": "groups",
-        "additionalProperties": ["netbios_name_and_sam_account_name", "emit_as_roles"]
+        "additionalProperties": ["netbios_domain_and_sam_account_name", "emit_as_roles"]
     }],
 
     "idToken": [{
         "name": "groups",
-        "additionalProperties": ["netbios_name_and_sam_account_name", "emit_as_roles"]
+        "additionalProperties": ["netbios_domain_and_sam_account_name", "emit_as_roles"]
     }]
 }
 ```
@@ -266,4 +266,4 @@ Emit group names to be returned in `NetbiosDomain\sAMAccountName` format as the
 
 - [Add authorization using groups & group claims to an ASP.NET Core web app (code sample)](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/5-WebApp-AuthZ/5-2-Groups/README.md)
 - [Assign a user or group to an enterprise app](../../active-directory/manage-apps/assign-user-or-group-access-portal.md)
-- [Configure role claims](../../active-directory/develop/active-directory-enterprise-app-role-management.md)
+- [Configure role claims](../../active-directory/develop/active-directory-enterprise-app-role-management.md)

articles/aks/TOC.yml

@@ -181,7 +181,7 @@
           href: upgrade-cluster.md
         - name: Use Uptime SLA
           href: uptime-sla.md
-        - name: Use Draft
+        - name: Use Draft (preview)
           href: draft.md
         - name: Use proximity placement groups
           href: reduce-latency-ppg.md
@@ -467,8 +467,6 @@
           href: open-service-mesh-uninstall-add-on.md
     - name: Kubernetes Event-driven Autoscaler add-on (preview)
       href: keda.md
-    - name: Web Application Routing (preview)
-      href: web-app-routing.md
     - name: Use cluster extensions
       href: cluster-extensions.md
     - name: DevOps

articles/aks/draft.md

@@ -104,22 +104,6 @@ You can also run the command on a specific directory using the `--destination` f
 az aks draft up --destination /Workspaces/ContosoAir
 ```
 
-## Use Web Application Routing with Draft to make your application accessible over the internet
-
-[Web Application Routing][web-app-routing] is the easiest way to get your web application up and running in Kubernetes securely, removing the complexity of ingress controllers and certificate and DNS management while offering configuration for enterprises looking to bring their own. Web Application Routing offers a managed ingress controller based on nginx that you can use without restrictions and integrates out of the box with Open Service Mesh to secure intra-cluster communications.
-
-To set up Draft with Web Application Routing, use `az aks draft update` and pass in the DNS name and Azure Key Vault-stored certificate when prompted:
-
-```azure-cli-interactive
-az aks draft update
-```
-
-You can also run the command on a specific directory using the `--destination` flag:
-
-```azure-cli-interactive
-az aks draft update --destination /Workspaces/ContosoAir
-```
-
 ## Delete the extension
 
 To delete the extension and remove Draft from your AKS cluster, you can use the following command: 

articles/aks/integrations.md

@@ -26,8 +26,6 @@ The below table shows the available add-ons.
 | ingress-appgw | Use Application Gateway Ingress Controller with your AKS cluster. | [What is Application Gateway Ingress Controller?][agic] |
 | open-service-mesh | Use Open Service Mesh with your AKS cluster. | [Open Service Mesh AKS add-on][osm] |
 | azure-keyvault-secrets-provider | Use Azure Keyvault Secrets Provider addon.| [Use the Azure Key Vault Provider for Secrets Store CSI Driver in an AKS cluster][keyvault-secret-provider] |
-| web_application_routing | Use a managed NGINX ingress Controller with your AKS cluster.| [Web Application Routing Overview][web-app-routing] |
-
 
 ## Extensions
 
@@ -88,4 +86,3 @@ The below table shows a few examples of open-source and third-party integrations
 [spark-kubernetes]: https://spark.apache.org/docs/latest/running-on-kubernetes.html
 [dapr-overview]: ./dapr.md
 [gitops-overview]: ../azure-arc/kubernetes/conceptual-gitops-flux2.md
-[web-app-routing]: web-app-routing.md

articles/aks/keda.md

@@ -5,7 +5,7 @@ services: container-service
 author: jahabibi
 ms.topic: article
 ms.custom: event-tier1-build-2022
-ms.date: 05/13/2021
+ms.date: 05/24/2021
 ms.author: jahabibi
 ---
 
@@ -26,23 +26,42 @@ The KEDA add-on makes it even easier by deploying a managed KEDA installation, p
 
 ## Prerequisites
 
+> [!NOTE]
+> KEDA is currently only available in the `westcentralus` region.
+
 - An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
 - [Azure CLI installed](/cli/azure/install-azure-cli).
 
-## Deploy the KEDA add-on with Azure CLI
-
-The KEDA add-on can be enabled with the Azure CLI when deploying an AKS cluster.
+### Register the `AKS-KedaPreview` feature flag
 
-To do so, use the [az aks create][az-aks-create] command with the `--enable-keda` argument.
+To use the KEDA, you must enable the `AKS-KedaPreview` feature flag on your subscription. 
 
 ```azurecli
-az aks create --resource-group MyResourceGroup --name MyAKSCluster --enable-keda
+az feature register --name AKS-KedaPreview --namespace Microsoft.ContainerService
+```
+
+You can check on the registration status by using the `az feature list` command:
+
+```azurecli-interactive
+az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AKS-KedaPreview')].{Name:name,State:properties.state}"
+```
+
+When ready, refresh the registration of the *Microsoft.ContainerService* resource provider by using the `az provider register` command:
+
+```azurecli-interactive
+az provider register --namespace Microsoft.ContainerService
 ```
 
-Additionally, KEDA can be deployed to an existing cluster via the [az aks update][az aks update] command.
+## Deploy the KEDA add-on with Azure Resource Manager (ARM) templates
 
-```azure cli
-az aks update --resource-group MyResourceGroup --name MyAKSCluster --enable-keda
+The KEDA add-on can be enabled by deploying an AKS cluster with an Azure Resource Manager template and specifying the `workloadAutoScalerProfile` field:
+
+```json
+    "workloadAutoScalerProfile": {
+        "keda": {
+            "enabled": true
+        }
+    }
 ```
 
 ## Connect to your AKS cluster
@@ -61,23 +80,72 @@ To configure `kubectl` to connect to your Kubernetes cluster, use the [az aks ge
 az aks get-credentials --resource-group MyResourceGroup --name MyAKSCluster
 ```
 
+## Example deployment
+
+The following snippet is a sample deployment that creates a cluster with KEDA enabled with a single node pool comprised of three `DS2_v5` nodes.
+
+```json
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "resources": [
+        {
+            "apiVersion": "2022-05-02-preview",
+            "dependsOn": [],
+            "type": "Microsoft.ContainerService/managedClusters",
+            "location": "westcentralus",
+            "name": "myAKSCluster",
+            "properties": {
+                "kubernetesVersion": "1.23.5",
+                "enableRBAC": true,
+                "dnsPrefix": "myAKSCluster",
+                "agentPoolProfiles": [
+                    {
+                        "name": "agentpool",
+                        "osDiskSizeGB": 200,
+                        "count": 3,
+                        "enableAutoScaling": false,
+                        "vmSize": "Standard_D2S_v5",
+                        "osType": "Linux",
+                        "storageProfile": "ManagedDisks",
+                        "type": "VirtualMachineScaleSets",
+                        "mode": "System",
+                        "maxPods": 110,
+                        "availabilityZones": [],
+                        "nodeTaints": [],
+                        "enableNodePublicIP": false
+                    }
+                ],
+                "networkProfile": {
+                    "loadBalancerSku": "standard",
+                    "networkPlugin": "kubenet"
+                },
+                "workloadAutoScalerProfile": {
+                    "keda": {
+                        "enabled": true
+                    }
+                }
+            },
+            "identity": {
+                "type": "SystemAssigned"
+            }
+        }
+    ]
+}
+```
+
 ## Use KEDA
+
 KEDA scaling will only work once a custom resource definition has been defined (CRD). To learn more about KEDA CRDs, follow the official [KEDA documentation][keda-scalers] to define your scaler.
 
 ## Clean Up
-To remove KEDA, utilize the `--disable-keda` flag.
-
-```azurecli
-az aks update --resource-group MyResourceGroup --name MyAKSCluster --disable-keda
-```
 
 To remove the resource group, and all related resources, use the [az group delete][az-group-delete] command:
 
 ```azurecli
 az group delete --name MyResourceGroup
 ```
 
-
 <!-- LINKS - internal -->
 [az-aks-create]: /cli/azure/aks#az-aks-create
 [az aks install-cli]: /cli/azure/aks#az-aks-install-cli