Merge pull request #235336 from asudbring/cni-patch

ttorble · web-flow · commit 2a6fb6e44e6d · 2023-04-21T08:57:46.000+01:00
Paragraph move from one article to the other for request from Khushbu Parekh
diff --git a/articles/aks/configure-azure-cni-dynamic-ip-allocation.md b/articles/aks/configure-azure-cni-dynamic-ip-allocation.md
@@ -1,8 +1,13 @@
 ---
-title: Configure Azure CNI networking for dynamic allocation of IPs and enhanced subnet support in Azure Kubernetes Service (AKS)
+title: Configure Azure CNI networking for dynamic allocation of IPs and enhanced subnet support
+titleSuffix: Azure Kubernetes Service
 description: Learn how to configure Azure CNI (advanced) networking for dynamic allocation of IPs and enhanced subnet support in Azure Kubernetes Service (AKS)
+author: asudbring
+ms.author: allensu
+ms.service: azure-kubernetes-service
+ms.subservice: aks-networking
 ms.topic: article
-ms.date: 01/09/2023
+ms.date: 04/20/2023
 ms.custom: references_regions, devx-track-azurecli
 ---
 
@@ -14,8 +19,8 @@ It offers the following benefits:
 
 * **Better IP utilization**: IPs are dynamically allocated to cluster Pods from the Pod subnet. This leads to better utilization of IPs in the cluster compared to the traditional CNI solution, which does static allocation of IPs for every node.
 * **Scalable and flexible**: Node and pod subnets can be scaled independently. A single pod subnet can be shared across multiple node pools of a cluster or across multiple AKS clusters deployed in the same VNet. You can also configure a separate pod subnet for a node pool.  
-* **High performance**: Since pod are assigned VNet IPs, they have direct connectivity to other cluster pod and resources in the VNet. The solution supports very large clusters without any degradation in performance.
-* **Separate VNet policies for pods**: Since pods have a separate subnet, you can configure separate VNet policies for them that are different from node policies. This enables many useful scenarios such as allowing internet connectivity only for pods and not for nodes, fixing the source IP for pod in a node pool using a VNet Network NAT, and using NSGs to filter traffic between node pools.  
+* **High performance**: Since pod are assigned virtual network IPs, they have direct connectivity to other cluster pod and resources in the VNet. The solution supports very large clusters without any degradation in performance.
+* **Separate VNet policies for pods**: Since pods have a separate subnet, you can configure separate VNet policies for them that are different from node policies. This enables many useful scenarios such as allowing internet connectivity only for pods and not for nodes, fixing the source IP for pod in a node pool using an Azure NAT Gateway, and using NSGs to filter traffic between node pools.  
 * **Kubernetes network policies**: Both the Azure Network Policies and Calico work with this new solution.
 
 This article shows you how to use Azure CNI networking for dynamic allocation of IPs and enhanced subnet support in AKS.
@@ -106,6 +111,48 @@ az aks nodepool add --cluster-name $clusterName -g $resourceGroup  -n newnodepoo
     --no-wait
 ```
 
+## Monitor IP subnet usage
+
+Azure CNI provides the capability to monitor IP subnet usage. To enable IP subnet usage monitoring, follow the steps below:
+
+### Get the YAML file
+
+1. Download or grep the file named container-azm-ms-agentconfig.yaml from [GitHub][github].
+
+2. Find **`azure_subnet_ip_usage`** in integrations. Set `enabled` to `true`.
+
+3. Save the file.
+
+### Get the AKS credentials
+
+Set the variables for subscription, resource group and cluster. Consider the following as examples:
+
+```azurecli
+
+    $s="subscriptionId"
+
+    $rg="resourceGroup"
+
+    $c="ClusterName"
+
+    az account set -s $s
+
+    az aks get-credentials -n $c -g $rg
+
+```
+
+### Apply the config
+
+1.	Open terminal in the folder the downloaded **container-azm-ms-agentconfig.yaml** file is saved.
+
+2.	First, apply the config using the command: `kubectl apply -f container-azm-ms-agentconfig.yaml`
+
+3.	This will restart the pod and after 5-10 minutes, the metrics will be visible.
+
+4.	To view the metrics on the cluster, go to Workbooks on the cluster page in the Azure portal, and find the workbook named "Subnet IP Usage". Your view will look similar to the following:
+
+    :::image type="content" source="media/configure-azure-cni-dynamic-ip-allocation/ip-subnet-usage.png" alt-text="A diagram of the Azure portal's workbook blade is shown, and metrics for an AKS cluster's subnet IP usage are displayed.":::    
+
 ## Dynamic allocation of IP addresses and enhanced subnet support FAQs
 
 * **Can I assign multiple pod subnets to a cluster/node pool?**
@@ -133,6 +180,9 @@ Learn more about networking in AKS in the following articles:
 * [Create an ingress controller with a dynamic public IP and configure Let's Encrypt to automatically generate TLS certificates][aks-ingress-tls]
 * [Create an ingress controller with a static public IP and configure Let's Encrypt to automatically generate TLS certificates][aks-ingress-static-tls]
 
+<!-- LINKS - External -->
+[github]: https://raw.githubusercontent.com/microsoft/Docker-Provider/ci_prod/kubernetes/container-azm-ms-agentconfig.yaml
+
 <!-- LINKS - Internal -->
 [aks-ingress-basic]: ingress-basic.md
 [aks-ingress-tls]: ingress-tls.md
diff --git a/articles/aks/configure-azure-cni.md b/articles/aks/configure-azure-cni.md
@@ -4,9 +4,10 @@ titleSuffix: Azure Kubernetes Service
 description: Learn how to configure Azure CNI (advanced) networking in Azure Kubernetes Service (AKS), including deploying an AKS cluster into an existing virtual network and subnet.
 author: asudbring
 ms.author: allensu
+ms.service: azure-kubernetes-service
 ms.subservice: aks-networking
 ms.topic: how-to
-ms.date: 05/16/2022
+ms.date: 04/20/2023
 ms.custom: references_regions, devx-track-azurecli
 ---
 
@@ -147,43 +148,6 @@ The following screenshot from the Azure portal shows an example of configuring t
 
 :::image type="content" source="../aks/media/networking-overview/portal-01-networking-advanced.png" alt-text="Screenshot from the Azure portal showing an example of configuring these settings during AKS cluster creation.":::
 
-## Monitor IP subnet usage
-
-Azure CNI provides the capability to monitor IP subnet usage. To enable IP subnet usage monitoring, follow the steps below:
-
-### Get the YAML file
-
-1. Download or grep the file named container-azm-ms-agentconfig.yaml from [GitHub][github].
-2. Find azure_subnet_ip_usage in integrations. Set `enabled` to `true`.
-3. Save the file.
-
-### Get the AKS credentials
-
-Set the variables for subscription, resource group and cluster. Consider the following as examples:
-
-```azurepowershell
-
-    $s="subscriptionId"
-
-    $rg="resourceGroup"
-
-    $c="ClusterName"
-
-    az account set -s $s
-
-    az aks get-credentials -n $c -g $rg
-
-```
-
-### Apply the config
-
-1.	Open terminal in the folder the downloaded container-azm-ms-agentconfig.yaml file is saved.
-2.	First, apply the config using the command: `kubectl apply -f container-azm-ms-agentconfig.yaml`
-3.	This will restart the pod and after 5-10 minutes, the metrics will be visible.
-4.	To view the metrics on the cluster, go to Workbooks on the cluster page in the Azure portal, and find the workbook named "Subnet IP Usage". Your view will look similar to the following:
-
-  :::image type="content" source="media/Azure-cni/ip-subnet-usage.png" alt-text="A diagram of the Azure portal's workbook blade is shown, and metrics for an AKS cluster's subnet IP usage are displayed.":::    
-
 ## Frequently asked questions
 
 * **Can I deploy VMs in my cluster subnet?**
diff --git a/articles/aks/media/configure-azure-cni-dynamic-ip-allocation/ip-subnet-usage.png b/articles/aks/media/configure-azure-cni-dynamic-ip-allocation/ip-subnet-usage.png
diff --git a/articles/azure-monitor/containers/container-insights-reports.md b/articles/azure-monitor/containers/container-insights-reports.md
@@ -43,7 +43,7 @@ To create a custom workbook based on any of these workbooks, select the **View W
     - IPs assigned to a pod.
 
 >[!NOTE]
-> By default 16 IP's are allocated from subnet to each node. This cannot be modified to be less than 16. For instructions on how to enable subnet IP usage metrics, see [Monitor IP Subnet Usage](../../aks/configure-azure-cni.md#monitor-ip-subnet-usage).
+> By default 16 IP's are allocated from subnet to each node. This cannot be modified to be less than 16. For instructions on how to enable subnet IP usage metrics, see [Monitor IP Subnet Usage](../../aks/configure-azure-cni-dynamic-ip-allocation.md#monitor-ip-subnet-usage).
 
 ## Resource Monitoring workbooks
 
