Merge pull request #244576 from James-Green-Microsoft/kuberenetes-extension-command-fixes

prmerger-automator[bot] · web-flow · commit 7ac188758d3b · 2023-07-12T07:40:23.000Z
Fixes based on feedback
diff --git a/articles/private-5g-core/commission-cluster.md b/articles/private-5g-core/commission-cluster.md
@@ -86,16 +86,6 @@ Additionally, if you go to the Azure portal and navigate to your **Azure Stack E
 
 :::image type="content" source="media/commission-cluster/commission-cluster-ase-resource.png" alt-text="Screenshot of Azure Stack Edge resource in the Azure portal. Azure Kubernetes Service (PREVIEW) is shown under Edge services in the left menu.":::
 
-## Enable high performance networking
-
-Azure Private 5G Core requires high performance networking (HPN) to be enabled on Azure Stack Edge using a minishell command. You can continue to use the minishell session you started in [Enter a minishell session](#enter-a-minishell-session). Run the following command:
-
-```powershell
-Invoke-Command -Session $minishellSession -ScriptBlock {Set-HcsNumaLpMapping -UseSkuPolicy}
-```
-
-Wait for the machine to reboot if necessary (approximately 5 minutes).
-
 ## Set up advanced networking
 
 You now need to configure virtual switches and virtual networks on those switches. You'll use the **Advanced networking** section of the Azure Stack Edge local UI to do this task.
@@ -140,7 +130,7 @@ You can input all the settings on this page before selecting **Apply** at the bo
             - If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway.
         - **DNS server** and **DNS suffix** should be left blank.
     1. Select **Modify** to save the configuration for this virtual network.
-    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 15 minutes.
+    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes.
     The page should now look like the following image:
 
   :::image type="content" source="media/commission-cluster/commission-cluster-advanced-networking-ase-2.png" alt-text="Screenshot showing Advanced networking, with a table of virtual switch information and a table of virtual network information.":::
@@ -157,7 +147,7 @@ You can input all the settings on this page before selecting **Apply** at the bo
             - If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway.
         - **DNS server** and **DNS suffix** should be left blank.
     1. Select **Modify** to save the configuration for this virtual network.
-    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 15 minutes.
+    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes.
   The page should now look like the following image:
 
   :::image type="content" source="media/commission-cluster/commission-cluster-advanced-networking.png" alt-text="Screenshot showing Advanced networking, with a table of virtual switch information and a table of virtual network information.":::
@@ -168,15 +158,15 @@ You can input all the settings on this page before selecting **Apply** at the bo
 In the local Azure Stack Edge UI, go to the **Kubernetes (Preview)** page. You'll set up all of the configuration and then apply it once, as you did in [Set up Advanced Networking](#set-up-advanced-networking).
 
 1. Under **Compute virtual switch**, select **Modify**.
-      1. Select the management vswitch (for example, *vswitch-port2*)
+      1. Select the vswitch with compute intent (for example, *vswitch-port2*)
       1. Enter six IP addresses in a range for the node IP addresses on the management network.
       1. Enter one IP address in a range for the service IP address, also on the management network.
       1. Select **Modify** at the bottom of the panel to save the configuration.
 1. Under **Virtual network**, select a virtual network (from **N2**, **N3**, **N6-DN1**, **N6-DN2**, and **N6-DN3**). In the side panel:
       1. Enable the virtual network for Kubernetes and add a pool of IP addresses. Add a range of one IP address for the appropriate address (N2, N3, N6-DN1, N6-DN2 or N6-DN3 as collected earlier. For example, *10.10.10.20-10.10.10.20*.
       1. Repeat for each of the N2, N3, N6-DN1, N6-DN2, and N6-DN3 virtual networks.
       1. Select **Modify** at the bottom of the panel to save the configuration.
-1. Select **Apply** at the bottom of the page and wait for the settings to be applied. Applying the settings will take approximately 15 minutes.
+1. Select **Apply** at the bottom of the page and wait for the settings to be applied. Applying the settings will take approximately 5 minutes.
 
 The page should now look like the following image:
 
@@ -284,12 +274,12 @@ The Azure Private 5G Core private mobile network requires a custom location and
 1. Set the following environment variables using the required values for your deployment:
 
     ```azurecli
-    export SUBSCRIPTION_ID=<subscription ID>
-    export RESOURCE_GROUP_NAME=<resource group name>
-    export LOCATION=<deployment region, for example eastus>
-    export CUSTOM_LOCATION=<custom location for the AKS cluster>
-    export RESOURCE_NAME=<resource name>
-    export TEMP_FILE=./tmpfile
+    $SUBSCRIPTION_ID=<subscription ID>
+    $RESOURCE_GROUP_NAME=<resource group name>
+    $LOCATION=<deployment region, for example eastus>
+    $CUSTOM_LOCATION=<custom location for the AKS cluster>
+    $ARC_CLUSTER_RESOURCE_NAME=<resource name>
+    $TEMP_FILE=./tmpfile
     ```
 
 1. Prepare your shell environment:
@@ -301,7 +291,7 @@ The Azure Private 5G Core private mobile network requires a custom location and
 1. Create the Network Function Operator Kubernetes extension:
 
     ```azurecli
-    cat > $TEMP_FILE <<EOF
+    Add-Content -Path $TEMP_FILE -Value @"
     {
       "helm.versions": "v3",
       "Microsoft.CustomLocation.ServiceAccount": "azurehybridnetwork-networkfunction-operator",
@@ -312,44 +302,44 @@ The Azure Private 5G Core private mobile network requires a custom location and
       "helm.release-namespace": "azurehybridnetwork",
       "managed-by": "helm"
     }
-    EOF
-
-    az k8s-extension create \
-    --name networkfunction-operator \
-    --cluster-name "$RESOURCE_NAME" \
-    --resource-group "$RESOURCE_GROUP_NAME" \
-    --cluster-type connectedClusters \
-    --extension-type "Microsoft.Azure.HybridNetwork" \
-    --auto-upgrade-minor-version "true" \
-    --scope cluster \
-    --release-namespace azurehybridnetwork \
-    --release-train preview \
+    "@
+
+    az k8s-extension create `
+    --name networkfunction-operator `
+    --cluster-name "$ARC_CLUSTER_RESOURCE_NAME" `
+    --resource-group "$RESOURCE_GROUP_NAME" `
+    --cluster-type connectedClusters `
+    --extension-type "Microsoft.Azure.HybridNetwork" `
+    --auto-upgrade-minor-version "true" `
+    --scope cluster `
+    --release-namespace azurehybridnetwork `
+    --release-train preview `
     --config-settings-file $TEMP_FILE 
     ```
 
 1. Create the Packet Core Monitor Kubernetes extension:
 
     ```azurecli
-    az k8s-extension create \
-    --name packet-core-monitor \
-    --cluster-name "$RESOURCE_NAME" \
-    --resource-group "$RESOURCE_GROUP_NAME" \
-    --cluster-type connectedClusters \
-    --extension-type "Microsoft.Azure.MobileNetwork.PacketCoreMonitor" \
-    --release-train stable \
+    az k8s-extension create `
+    --name packet-core-monitor `
+    --cluster-name "$ARC_CLUSTER_RESOURCE_NAME" `
+    --resource-group "$RESOURCE_GROUP_NAME" `
+    --cluster-type connectedClusters `
+    --extension-type "Microsoft.Azure.MobileNetwork.PacketCoreMonitor" `
+    --release-train stable `
     --auto-upgrade true 
     ```
 
 1. Create the custom location:
 
     ```azurecli
-    az customlocation create \
-    -n "$CUSTOM_LOCATION" \
-    -g "$RESOURCE_GROUP_NAME" \
-    --location "$LOCATION" \
-    --namespace azurehybridnetwork \
-    --host-resource-id "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Kubernetes/connectedClusters/$RESOURCE_NAME" \
-    --cluster-extension-ids "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Kubernetes/connectedClusters/$RESOURCE_NAME/providers/Microsoft.KubernetesConfiguration/extensions/networkfunction-operator"
+    az customlocation create `
+    -n "$CUSTOM_LOCATION" `
+    -g "$RESOURCE_GROUP_NAME" `
+    --location "$LOCATION" `
+    --namespace azurehybridnetwork `
+    --host-resource-id "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Kubernetes/connectedClusters/$ARC_CLUSTER_RESOURCE_NAME" `
+    --cluster-extension-ids "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Kubernetes/connectedClusters/$ARC_CLUSTER_RESOURCE_NAME/providers/Microsoft.KubernetesConfiguration/extensions/networkfunction-operator"
     ```
 
 You should see the new **Custom location** visible as a resource in the Azure portal within the specified resource group. Using the `kubectl get pods -A` command (with access to your *kubeconfig* file) should also show new pods corresponding to the extensions that have been installed. There should be one pod in the *azurehybridnetwork* namespace, and one in the *packet-core-monitor* namespace.
