Merge pull request #102998 from LaylaLiu-gmail/patch-1

Fix container app on arc public doc issue.

Author: Jak-MS

articles/container-apps/azure-arc-create-container-app.md

@@ -43,7 +43,8 @@ az extension add -s https://download.microsoft.com/download/5/c/2/5c2ec3fc-bd2a-
 Create a resource group for the services created in this tutorial.
 
 ```azurecli-interactive
-az group create --name myResourceGroup --location eastus 
+myResourceGroup="my-container-apps-resource-group"
+az group create --name $myResourceGroup --location eastus 
 ```
 
 ## Get custom location information
@@ -75,7 +76,8 @@ Now that you have the custom location ID, you can query for the connected enviro
 A connected environment is largely the same as a standard Container Apps environment, but network restrictions are controlled by the underlying Arc-enabled Kubernetes cluster.
 
 ```azure-interactive
-myConnectedEnvironment = az containerapp connected-env list --custom-location customLocationId -o tsv --query '[].id'
+myContainerApp="my-container-app"
+myConnectedEnvironment=$(az containerapp connected-env list --custom-location $customLocationId -o tsv --query '[].id')
 ```
 
 ## Create an app
@@ -84,16 +86,15 @@ The following example creates a Node.js app.
 
 ```azurecli-interactive
  az containerapp create \
-    --resource-group myResourceGroup \
-    --name myContainerApp \
-    --environment myConnectedEnvironment \
+    --resource-group $myResourceGroup \
+    --name $myContainerApp \
+    --environment $myConnectedEnvironment \
     --environment-type connected \
-    --image mcr.microsoft.com/azuredocs/container-apps-helloworld:latest \
+    --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
     --target-port 80 \
     --ingress 'external'
 
-az containerapp browse --resource-group myResourceGroup \
-    --name myContainerApp
+az containerapp browse --resource-group $myResourceGroup --name $myContainerApp
 ```
 
 ## Get diagnostic logs using Log Analytics
@@ -112,7 +113,7 @@ let StartTime = ago(72h);
 let EndTime = now();
 ContainerAppsConsoleLogs_CL
 | where TimeGenerated between (StartTime .. EndTime)
-| where AppName_s =~ "myContainerApp"
+| where AppName_s =~ "my-container-app"
 ```
 
 The application logs for all the apps hosted in your Kubernetes cluster are logged to the Log Analytics workspace in the custom log table named `ContainerAppsConsoleLogs_CL`.

articles/container-apps/azure-arc-enable-cluster.md

@@ -91,7 +91,6 @@ Set environment variables based on your Kubernetes cluster deployment.
 
 ```bash
 GROUP_NAME="my-arc-cluster-group"
-CLUSTER_NAME="my-arc-cluster"
 AKS_CLUSTER_GROUP_NAME="my-aks-cluster-group"
 AKS_NAME="my-aks-cluster" 
 LOCATION="eastus" 
@@ -101,7 +100,6 @@ LOCATION="eastus"
 
 ```azurepowershell
 $GROUP_NAME="my-arc-cluster-group"
-$CLUSTER_NAME="my-arc-cluster"
 $AKS_CLUSTER_GROUP_NAME="my-aks-cluster-group"
 $AKS_NAME="my-aks-cluster" 
 $LOCATION="eastus" 
@@ -121,7 +119,7 @@ The following steps help you get started understanding the service, but for prod
     az group create --name $AKS_CLUSTER_GROUP_NAME --location $LOCATION
     az aks create \
        --resource-group $AKS_CLUSTER_GROUP_NAME \
-       --name $AKS_NAME \ 
+       --name $AKS_NAME \
        --enable-aad \
        --generate-ssh-keys
     ```
@@ -212,7 +210,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
 
     az monitor log-analytics workspace create `
         --resource-group $GROUP_NAME `
-        --workspace-name $wORKSPACE_NAME
+        --workspace-name $WORKSPACE_NAME
     ```
 
     ---
@@ -224,13 +222,13 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
     ```azurecli
     LOG_ANALYTICS_WORKSPACE_ID=$(az monitor log-analytics workspace show \
         --resource-group $GROUP_NAME \
-        --workspace-name $wORKSPACE_NAME \
+        --workspace-name $WORKSPACE_NAME \
         --query customerId \
         --output tsv)
     LOG_ANALYTICS_WORKSPACE_ID_ENC=$(printf %s $LOG_ANALYTICS_WORKSPACE_ID | base64 -w0) # Needed for the next step
     lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys \
         --resource-group $GROUP_NAME \
-        --workspace-name $wORKSPACE_NAME \
+        --workspace-name $WORKSPACE_NAME \
         --query primarySharedKey \
         --output tsv)
     lOG_ANALYTICS_KEY_ENC=$(printf %s $lOG_ANALYTICS_KEY | base64 -w0) # Needed for the next step
@@ -241,13 +239,13 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
     ```azurepowershell
     $LOG_ANALYTICS_WORKSPACE_ID=$(az monitor log-analytics workspace show `
         --resource-group $GROUP_NAME `
-        --workspace-name $wORKSPACE_NAME `
+        --workspace-name $WORKSPACE_NAME `
         --query customerId `
         --output tsv)
     $LOG_ANALYTICS_WORKSPACE_ID_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($LOG_ANALYTICS_WORKSPACE_ID))# Needed for the next step
     $lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys `
         --resource-group $GROUP_NAME `
-        --workspace-name $wORKSPACE_NAME `
+        --workspace-name $WORKSPACE_NAME `
         --query primarySharedKey `
         --output tsv)
     $lOG_ANALYTICS_KEY_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($lOG_ANALYTICS_KEY))
@@ -294,7 +292,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
         --release-namespace $NAMESPACE \
         --configuration-settings "Microsoft.CustomLocation.ServiceAccount=default" \
         --configuration-settings "appsNamespace=${NAMESPACE}" \
-        --configuration-settings "CLUSTER_NAME=${CONNECTED_ENVIRONMENT_NAME}" \
+        --configuration-settings "clusterName=${CONNECTED_ENVIRONMENT_NAME}" \
         --configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" \
         --configuration-settings "logProcessor.appLogs.destination=log-analytics" \
         --configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" \
@@ -316,7 +314,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
         --release-namespace $NAMESPACE `
         --configuration-settings "Microsoft.CustomLocation.ServiceAccount=default" `
         --configuration-settings "appsNamespace=${NAMESPACE}" `
-        --configuration-settings "CLUSTER_NAME=${CONNECTED_ENVIRONMENT_NAME}" `
+        --configuration-settings "clusterName=${CONNECTED_ENVIRONMENT_NAME}" `
         --configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" `
         --configuration-settings "logProcessor.appLogs.destination=log-analytics" `
         --configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" `
@@ -335,7 +333,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
     | - | - |
     | `Microsoft.CustomLocation.ServiceAccount` | The service account created for the custom location. It's recommended that it 's set to the value `default`. |
     | `appsNamespace` | The namespace used to create the app definitions and revisions. It **must** match that of the extension release namespace. |
-    | `CLUSTER_NAME` | The name of the Container Apps extension Kubernetes environment that will be created against this extension. |
+    | `clusterName` | The name of the Container Apps extension Kubernetes environment that will be created against this extension. |
     | `logProcessor.appLogs.destination` | Optional. Destination for application logs. Accepts `log-analytics` or `none`, choosing none disables platform logs. |
     | `logProcessor.appLogs.logAnalyticsConfig.customerId` | Required only when `logProcessor.appLogs.destination` is set to `log-analytics`. The base64-encoded Log analytics workspace ID. This parameter should be configured as a protected setting. |
     | `logProcessor.appLogs.logAnalyticsConfig.sharedKey` | Required only when `logProcessor.appLogs.destination` is set to `log-analytics`. The base64-encoded Log analytics workspace shared key. This parameter should be configured as a protected setting. |4
@@ -474,7 +472,8 @@ Before you can start creating apps in the custom location, you need an [Azure Co
     az containerapp connected-env create \
         --resource-group $GROUP_NAME \
         --name $CONNECTED_ENVIRONMENT_NAME \
-        --custom-location $CUSTOM_LOCATION_ID 
+        --custom-location $CUSTOM_LOCATION_ID \
+        --location $LOCATION
     ```
 
     # [PowerShell](#tab/azure-powershell)
@@ -483,7 +482,8 @@ Before you can start creating apps in the custom location, you need an [Azure Co
     az containerapp connected-env create `
         --resource-group $GROUP_NAME `
         --name $CONNECTED_ENVIRONMENT_NAME `
-        --custom-location $CUSTOM_LOCATION_ID       
+        --custom-location $CUSTOM_LOCATION_ID `
+        --location $LOCATION
     ```
 
     ---