updates per Nick G, Nick O, and Shubham

Author: hhunter-ms

articles/aks/TOC.yml

@@ -444,6 +444,8 @@
               href: dapr-overview.md
             - name: How to use Dapr
               href: dapr.md
+            - name: Migrate from Dapr OSS
+              href: dapr-migration.md
         - name: Use GitOps
           href: ../azure-arc/kubernetes/tutorial-use-gitops-flux2.md
           maintainContext: true

articles/aks/dapr-migration.md

@@ -1,41 +1,41 @@
 ---
-title: Migrate to the Dapr extension in Azure Kubernetes Service (AKS) 
-description: Learn how to migrate from Dapr OSS to the Dapr extension in AKS
+title: Migrate from Dapr OSS to the Dapr extension for Azure Kubernetes Service (AKS) 
+description: Learn how to migrate from Dapr OSS to the Dapr extension for AKS
 author: hhunter-ms
 ms.author: hannahhunter
 ms.reviewer: nigreenf
 ms.service: container-service
 ms.topic: article
-ms.date: 07/20/2022
-ms.custom: devx-track-azurecli, ignite-fall-2021, event-tier1-build-2022
+ms.date: 07/21/2022
+ms.custom: devx-track-azurecli
 ---
 
-# Migrate to the Dapr extension in Azure Kubernetes Service (AKS)
+# Migrate from Dapr OSS to the Dapr extension for Azure Kubernetes Service (AKS)
 
-You've installed and configured Dapr OSS on your Kubernetes cluster and want to migrate to the Dapr extension on AKS. Before you can successfully migrate to the Dapr extension, you need to fully remove Dapr OSS from your machine. In this guide, you will migrate from Dapr OSS to the Dapr extension for AKS by:
+You've installed and configured Dapr OSS on your Kubernetes cluster and want to migrate to the Dapr extension on AKS. Before you can successfully migrate to the Dapr extension, you need to fully remove Dapr OSS from your AKS cluster. In this guide, you will migrate from Dapr OSS by:
 
 > [!div class="checklist"]
-> - Uninstalling Dapr, including CRDs and namespace.
-> - Installing Dapr via the Dapr extension for AKS.
-> - Applying your components.
-> - Restarting your Dapr workloads. 
+> - Uninstalling Dapr, including CRDs and the `dapr-system` namespace
+> - Installing Dapr via the Dapr extension for AKS
+> - Applying your components
+> - Restarting your applications that use Dapr
 
 > [!NOTE]
-> Expect downtime of approximately 10 minutes while migrating to Dapr extension in AKS (2 minutes uninstall/5 minutes install). Downtime may take longer depending on varying factors. During this downtime, no Dapr functionality should be expected to run, including actors, service-to-service invocation, secrets, RBAC roles, etc.
+> Expect downtime of approximately 10 minutes while migrating to Dapr extension for AKS. Downtime may take longer depending on varying factors. During this downtime, no Dapr functionality should be expected to run.
 
 ## Uninstall Dapr 
 
-#### [CLI](#tab/cli)
+#### [Dapr CLI](#tab/cli)
 
 1. Run the following command to uninstall Dapr and all CRDs:
 
-```cli
+```bash
 dapr uninstall -k –-all
 ```
 
 1. Uninstall the Dapr namespace:
 
-```cli
+```bash
 kubectl delete namespace dapr-system
 ```
 
@@ -46,13 +46,13 @@ kubectl delete namespace dapr-system
 
 1. Run the following command to uninstall Dapr:
 
-```cli
+```bash
 dapr uninstall -k –-all
 ```
 
 1. Uninstall CRDs: 
 
-```cli
+```bash
 kubectl delete crd components.dapr.io
 kubectl delete crd configurations.dapr.io
 kubectl delete crd subscriptions.dapr.io
@@ -61,20 +61,20 @@ kubectl delete crd resiliencies.dapr.io
 
 1. Uninstall the Dapr namespace:
 
-```cli
+```bash
 kubectl delete namespace dapr-system
 ```
 
 > [!NOTE]
-> `dapr-system` is the default namespace installed with `dapr init -k`. If you created a custom namespace, replace `dapr-system` with your namespace.
+> `dapr-system` is the default namespace while doing a Helm install. If you created a custom namespace (`helm install dapr dapr/dapr --namespace <my-namespace>`), replace `dapr-system` with your namespace.
 
 ---
 
 ## Install Dapr via the AKS extension
 
 Once you've uninstalled Dapr from your system, install the [Dapr extension for AKS and Arc-enabled Kubernetes](./dapr.md#create-the-extension-and-install-dapr-on-your-aks-or-arc-enabled-kubernetes-cluster).
 
-```cli
+```bash
 az k8s-extension create --cluster-type managedClusters \                                               
 --cluster-name <dapr-cluster-name> \
 --resource-group <dapr-resource-group> \
@@ -84,14 +84,18 @@ az k8s-extension create --cluster-type managedClusters \
 
 ## Apply your components
 
-```cli
+```bash
 kubectl apply -f <component.yaml>
 ```
 
-## Restart your Dapr workloads
+## Restart your applications that use Dapr
+
+Restarting the deployment will create a new sidecar from the new Dapr installation.
 
-```cli
+```bash
 kubectl rollout restart <deployment-name>
 ```
 
 ## Next steps
+
+Learn more about [the cluster extension](./dapr-overview.md) and [how to use it](./dapr.md).

articles/aks/dapr-overview.md

@@ -4,7 +4,7 @@ description: Learn more about using Dapr on your Azure Kubernetes Service (AKS)
 ms.author: nickoman
 ms.service: container-service
 ms.topic: article
-ms.date: 05/03/2022
+ms.date: 07/21/2022
 ms.custom: devx-track-azurecli, event-tier1-build-2022
 ---
 
@@ -69,6 +69,8 @@ When installing Dapr OSS via helm or the Dapr CLI, runtime versions and configur
 
 Lastly, the Dapr extension is an extension of AKS, therefore you can expect the same support policy as other AKS features.
 
+[Learn more about migrating from Dapr OSS to the Dapr extension for AKS][dapr-migration].
+
 ### How can I switch to using the Dapr extension if I’ve already installed Dapr via a method, such as Helm?
 
 Recommended guidance is to completely uninstall Dapr from the AKS cluster and reinstall it via the cluster extension.  
@@ -84,6 +86,7 @@ After learning about Dapr and some of the challenges it solves, try [Deploying a
 [osm-docs]: ./open-service-mesh-about.md
 [cluster-extensions]: ./cluster-extensions.md
 [dapr-quickstart]: ./quickstart-dapr.md
+[dapr-migration]: ./dapr-migration.md
 
 <!-- Links External -->
 [dapr-docs]: https://docs.dapr.io/

articles/aks/dapr.md

@@ -5,7 +5,7 @@ author: greenie-msft
 ms.author: nigreenf
 ms.service: container-service
 ms.topic: article
-ms.date: 07/19/2022
+ms.date: 07/21/2022
 ms.custom: devx-track-azurecli, ignite-fall-2021, event-tier1-build-2022
 ---
 
@@ -83,6 +83,9 @@ When installing the Dapr extension, use the flag value that corresponds to your
 - **AKS cluster**: `--cluster-type managedClusters`. 
 - **Arc-enabled Kubernetes cluster**: `--cluster-type connectedClusters`.
 
+> [!NOTE]
+> If you're using Dapr OSS on your AKS cluster and would like to install the Dapr extension for AKS, read more about [how to successfully migrate to the Dapr extension][dapr-migration]. 
+
 Create the Dapr extension, which installs Dapr on your AKS or Arc-enabled Kubernetes cluster. For example, for an AKS cluster:
 
 ```azure-cli-interactive
@@ -280,6 +283,7 @@ az k8s-extension delete --resource-group myResourceGroup --cluster-name myAKSClu
 [arc-k8s-cluster]: ../azure-arc/kubernetes/quickstart-connect-cluster.md
 [update-extension]: ./cluster-extensions.md#update-extension-instance
 [install-cli]: /cli/azure/install-azure-cli
+[dapr-migration]: ./dapr-migration.md
 
 <!-- LINKS EXTERNAL -->
 [kubernetes-production]: https://docs.dapr.io/operations/hosting/kubernetes/kubernetes-production