Merge pull request #2964 from dtzar/docs-addonupdate

📖 Add managed addon info
kubernetes-sigs · Jan 4, 2023 · 2d75f5e · 2d75f5e
2 parents 97f2576 + 577f5f8
commit 2d75f5e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/docs/book/src/topics/addons.md b/docs/book/src/topics/addons.md
@@ -1,3 +1,12 @@
+# Overview
+
+This section provides examples for addons for self-managed clusters. For manged cluster addons, please go to the [managed cluster specifications](https://capz.sigs.k8s.io/topics/managedcluster.html#specification).
+
+Self managed cluster addon options covered here:
+
+- CNI - including Calico for IPv4, IPv6, dual stack, and Flannel
+- [External Cloud provider](#external-cloud-provider) - including Azure File, Azure Disk CSI storage drivers
+
 # CNI
 
 By default, the CNI plugin is not installed for self-managed clusters, so you have to [install your own](https://cluster-api.sigs.k8s.io/user/quick-start.html#deploy-a-cni-solution).

diff --git a/docs/book/src/topics/managedcluster.md b/docs/book/src/topics/managedcluster.md
@@ -131,6 +131,11 @@ spec:
   networkPlugin: azure # or kubenet
   sku:
     tier: Free # or Paid
+  addonProfiles:
+  - name: azureKeyvaultSecretsProvider
+    enabled: true
+  - name: azurepolicy
+    enabled: true
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureManagedCluster
@@ -190,9 +195,12 @@ spec:
   sku: Standard_D2s_v4
 ```
 
-The main features for configuration today are
-[networkPolicy](https://docs.microsoft.com/en-us/azure/aks/concepts-network#network-policies) and
-[networkPlugin](https://docs.microsoft.com/en-us/azure/aks/concepts-network#azure-virtual-networks).
+The main features for configuration are:
+
+- [networkPolicy](https://docs.microsoft.com/en-us/azure/aks/concepts-network#network-policies)
+- [networkPlugin](https://docs.microsoft.com/en-us/azure/aks/concepts-network#azure-virtual-networks)
+- [addonProfiles](https://learn.microsoft.com/cli/azure/aks/addon?view=azure-cli-latest#az-aks-addon-list-available) - for additional addons not listed below, look for the `*ADDON_NAME` values in [this code](https://github.com/Azure/azure-cli/blob/main/src/azure-cli/azure/cli/command_modules/acs/_consts.py).
+
 Other configuration values like subscriptionId and node machine type
 should be fairly clear from context.
 
@@ -201,6 +209,20 @@ should be fairly clear from context.
 | networkPlugin             | azure, kubenet                |
 | networkPolicy             | azure, calico                 |
 
+| addon name                | YAML value                |
+|---------------------------|---------------------------|
+| http_application_routing  | httpApplicationRouting    |
+| monitoring                | omsagent                  |
+| virtual-node              | aciConnector              |
+| kube-dashboard            | kubeDashboard             |
+| azure-policy              | azurepolicy               |
+| ingress-appgw             | ingressApplicationGateway |
+| confcom                   | ACCSGXDevicePlugin        |
+| open-service-mesh         | openServiceMesh           |
+| azure-keyvault-secrets-provider |  azureKeyvaultSecretsProvider |
+| gitops                    | Unsupported?              |
+| web_application_routing   | Unsupported?              |
+
 ### Use an existing Virtual Network to provision an AKS cluster
 
 If you'd like to deploy your AKS cluster in an existing Virtual Network, but create the cluster itself in a different resource group, you can configure the AzureManagedControlPlane resource with a reference to the existing Virtual Network and subnet. For example: