Merge pull request #270418 from hhunter-ms/hh-231357

[Dapr/AKS] Add instructions and zone pivots for ARM/Bicep deployment

Author: JamesJBarnett

articles/aks/dapr-overview.md

@@ -3,7 +3,7 @@ title: Dapr extension for Azure Kubernetes Service (AKS) overview
 description: Learn more about using Dapr on your Azure Kubernetes Service (AKS) cluster to develop applications.
 ms.author: nickoman
 ms.topic: article
-ms.date: 07/07/2023
+ms.date: 03/28/2024
 ---
 
 # Dapr
@@ -21,6 +21,14 @@ Dapr is incrementally adoptable. You can use any of the API building blocks as n
 
 ## Capabilities and features
 
+[Using the Dapr extension to provision Dapr on your AKS or Arc-enabled Kubernetes cluster](../azure-arc/kubernetes/conceptual-extensions.md) eliminates the overhead of:
+- Downloading Dapr tooling
+- Manually installing and managing the Dapr runtime on your AKS cluster
+
+[You can install, deploy, and configure the Dapr extension on your cluster using either the Azure CLI or a Bicep template.](./dapr.md) 
+
+Additionally, the extension offers support for all [native Dapr configuration capabilities][dapr-configuration-options] through simple command-line arguments.
+
 Dapr provides the following set of capabilities to help with your microservice development on AKS:
 
 - Easy provisioning of Dapr on AKS through [cluster extensions][cluster-extensions].
@@ -98,6 +106,7 @@ After learning about Dapr and some of the challenges it solves, try [Deploying a
 [dapr-quickstart]: ./quickstart-dapr.md
 [dapr-migration]: ./dapr-migration.md
 [aks-msi]: ./use-managed-identity.md
+[dapr-configuration-options]: ./dapr-settings.md
 
 <!-- Links External -->
 [dapr-docs]: https://docs.dapr.io/

articles/aks/dapr-settings.md

@@ -6,7 +6,7 @@ ms.author: hannahhunter
 ms.topic: article
 ms.custom: build-2023, devx-track-azurecli, linux-related-content
 ms.subservice: aks-developer
-ms.date: 06/08/2023
+ms.date: 04/01/2024
 ---
 
 # Configure the Dapr extension for your Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes project
@@ -17,7 +17,13 @@ Once you've [created the Dapr extension](./dapr.md), you can configure the [Dapr
 - Setting automatic CRD updates
 - Configuring the Dapr release namespace
 
-The extension enables you to set Dapr configuration options by using the `--configuration-settings` parameter. For example, to provision Dapr with high availability (HA) enabled, set the `global.ha.enabled` parameter to `true`:
+The extension enables you to set Dapr configuration options by using the `--configuration-settings` parameter in the Azure CLI or `configurationSettings` property in a Bicep template. 
+
+## Provision Dapr with high availability (HA) enabled
+
+Provision Dapr with high availability (HA) enabled by setting the `global.ha.enabled` parameter to `true`.
+
+# [Azure CLI](#tab/cli)
 
 ```azurecli
 az k8s-extension create --cluster-type managedClusters \
@@ -31,7 +37,22 @@ az k8s-extension create --cluster-type managedClusters \
 ```
 
 > [!NOTE]
-> If configuration settings are sensitive and need to be protected, for example cert related information, pass the `--configuration-protected-settings` parameter and the value will be protected from being read.
+> If configuration settings are sensitive and need to be protected (for example, cert-related information), pass the `--configuration-protected-settings` parameter and the value will be protected from being read.
+
+# [Bicep](#tab/bicep)
+
+```bicep
+properties: {
+  configurationSettings: {
+    'global.ha.enabled': true
+  }
+}
+```
+
+> [!NOTE]
+> If configuration settings are sensitive and need to be protected (for example, cert-related information), use the `configurationProtectedSettings` property and the value will be protected from being read.
+
+---
 
 If no configuration-settings are passed, the Dapr configuration defaults to:
 
@@ -55,7 +76,9 @@ For a list of available options, see [Dapr configuration][dapr-configuration-opt
 
 ## Limit the extension to certain nodes
 
-In some configurations, you may only want to run Dapr on certain nodes. You can limit the extension by passing a `nodeSelector` in the extension configuration. If the desired `nodeSelector` contains `.`, you must escape them from the shell and the extension. For example, the following configuration will install Dapr to only nodes with `topology.kubernetes.io/zone: "us-east-1c"`:
+In some configurations, you may only want to run Dapr on certain nodes. You can limit the extension by passing a `nodeSelector` in the extension configuration. If the desired `nodeSelector` contains `.`, you must escape them from the shell and the extension. For example, the following configuration installs Dapr only to nodes with `topology.kubernetes.io/zone: "us-east-1c"`:
+
+# [Azure CLI](#tab/cli)
 
 ```azurecli
 az k8s-extension create --cluster-type managedClusters \
@@ -84,9 +107,37 @@ az k8s-extension create --cluster-type managedClusters \
 --configuration-settings "global.daprControlPlaneArch=amd64”
 ```
 
+# [Bicep](#tab/bicep)
+
+```bicep
+properties: {
+  configurationSettings: {
+    'global.clusterType': 'managedclusters'
+    'global.ha.enabled': true
+    'global.nodeSelector.kubernetes\.io/zone': 'us-east-1c'
+    
+  }
+}
+```
+
+For managing OS and architecture, use the [supported versions](https://github.com/dapr/dapr/blob/b8ae13bf3f0a84c25051fcdacbfd8ac8e32695df/docker/docker.mk#L50) of the `global.daprControlPlaneOs` and `global.daprControlPlaneArch` configuration:
+
+```bicep
+properties: {
+  configurationSettings: {
+    'global.clusterType': 'managedclusters'
+    'global.ha.enabled': true
+    'global.daprControlPlaneOs': 'linux'
+    'global.daprControlPlaneArch': 'amd64'
+  }
+}
+```
+
+---
+
 ## Install Dapr in multiple availability zones while in HA mode
 
-By default, the placement service uses a storage class of type `standard_LRS`. It is recommended to create a `zone redundant storage class` while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class: 
+By default, the placement service uses a storage class of type `standard_LRS`. It is recommended to create a **zone redundant storage class** while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class, add the `storageaccounttype` parameter: 
 
 ```yaml
 kind: StorageClass
@@ -101,7 +152,9 @@ parameters:
   storageaccounttype: Premium_ZRS
 ```
 
-When installing Dapr, use the above storage class: 
+When installing Dapr, use the storage class you used in the YAML file: 
+
+# [Azure CLI](#tab/cli)
 
 ```azurecli
 az k8s-extension create --cluster-type managedClusters  
@@ -114,9 +167,26 @@ az k8s-extension create --cluster-type managedClusters
 --configuration-settings "dapr_placement.volumeclaims.storageClassName=custom-zone-redundant-storage"
 ```
 
+# [Bicep](#tab/bicep)
+
+```bicep
+properties: {
+  configurationSettings: {
+    'dapr_placement.volumeclaims.storageClassName': 'custom-zone-redundant-storage'
+    'global.ha.enabled': true  
+  }
+}
+```
+
+---
+
 ## Configure the Dapr release namespace
 
-You can configure the release namespace. The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. Include the cluster `--scope` to redefine the namespace.
+You can configure the release namespace. 
+
+# [Azure CLI](#tab/cli)
+
+The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. Include the cluster `--scope` to redefine the namespace.
 
 ```azurecli
 az k8s-extension create \
@@ -132,6 +202,22 @@ az k8s-extension create \
 --release-namespace dapr-custom
 ```
 
+# [Bicep](#tab/bicep)
+
+The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `releaseNamespace` in the cluster `scope` to redefine the namespace.
+
+```bicep
+properties: {
+  scope: {
+    cluster: {
+      releaseNamespace: 'dapr-custom'
+    }
+  }
+}
+```
+
+---
+
 [Learn how to configure the Dapr release namespace if you already have Dapr installed](./dapr-migration.md).
 
 ## Show current configuration settings
@@ -192,6 +278,8 @@ If you want to use an outbound proxy with the Dapr extension for AKS, you can do
 
 ## Updating your Dapr installation version
 
+# [Azure CLI](#tab/cli)
+
 If you are on a specific Dapr version and you don't have `--auto-upgrade-minor-version` available, you can use the following command to upgrade or downgrade Dapr:
 
 ```azurecli
@@ -202,6 +290,18 @@ az k8s-extension update --cluster-type managedClusters \
 --version 1.12.0 # Version to upgrade or downgrade to
 ```
 
+# [Bicep](#tab/bicep)
+
+If you are on a specific Dapr version and you don't have `autoUpgradeMinorVersion` available, you can use the following Bicep property to upgrade or downgrade Dapr:
+
+```bicep
+properties: {
+  version: '1.12.0'
+}
+```
+
+--- 
+
 The preceding command updates the Dapr control plane *only.* To update the Dapr sidecars, restart your application deployments:
 
 ```bash
@@ -210,7 +310,9 @@ kubectl rollout restart deploy/<DEPLOYMENT-NAME>
 
 ## Using Azure Linux-based images
 
-From Dapr version 1.8.0, you can use Azure Linux images with the Dapr extension. To use them, set the`global.tag` flag:
+From Dapr version 1.8.0, you can use Azure Linux images with the Dapr extension. To use them, set the `global.tag` flag:
+
+# [Azure CLI](#tab/cli)
 
 ```azurecli
 az k8s-extension update --cluster-type managedClusters \
@@ -220,13 +322,25 @@ az k8s-extension update --cluster-type managedClusters \
 --set global.tag=1.10.0-mariner
 ```
 
+# [Bicep](#tab/bicep)
+
+```bicep
+properties: {
+  global.tag: '1.10.0-mariner'
+}
+```
+
+--- 
+
 - [Learn more about using Mariner-based images with Dapr][dapr-mariner].
-- [Learn more about deploying AzureLinux on AKS][aks-azurelinux].
+- [Learn more about deploying Azure Linux on AKS][aks-azurelinux].
 
 
 ## Disable automatic CRD updates
 
-With Dapr version 1.9.2, CRDs are automatically upgraded when the extension upgrades. To disable this setting, you can set `hooks.applyCrds` to `false`. 
+From Dapr version 1.9.2, CRDs are automatically upgraded when the extension upgrades. To disable this setting, you can set `hooks.applyCrds` to `false`. 
+
+# [Azure CLI](#tab/cli)
 
 ```azurecli
 az k8s-extension update --cluster-type managedClusters \
@@ -236,6 +350,18 @@ az k8s-extension update --cluster-type managedClusters \
 --configuration-settings "hooks.applyCrds=false"
 ```
 
+# [Bicep](#tab/bicep)
+
+```bicep
+properties: {
+  configurationSettings: {
+    'hooks.applyCrds': false
+  } 
+}
+```
+
+---
+
 > [!NOTE]
 > CRDs are only applied in case of upgrades and are skipped during downgrades.
 

articles/aks/dapr-workflow.md

@@ -192,7 +192,7 @@ Notice that the workflow status is marked as completed.
 [install-cli]: /cli/azure/install-azure-cli
 [k8s-ext]: ./dapr.md#set-up-the-azure-cli-extension-for-cluster-extensions
 [cluster]: ./tutorial-kubernetes-deploy-cluster.md
-[k8s-sp]: ./dapr.md#register-the-kubernetesconfiguration-service-provider
+[k8s-sp]: ./dapr.md#register-the-kubernetesconfiguration-resource-provider
 [dapr-config]: ./dapr-settings.md
 [az-cloud-shell]: ./learn/quick-kubernetes-deploy-powershell.md#azure-cloud-shell
 [kubectl]: ./tutorial-kubernetes-deploy-cluster.md#connect-to-cluster-using-kubectl