Merge pull request #262953 from MicrosoftDocs/repo_sync_working_branch

Saisang · web-flow · commit 3514c92c7f78 · 2024-01-11T13:24:36.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/ai-services/openai/concepts/provisioned-throughput.md b/articles/ai-services/openai/concepts/provisioned-throughput.md
@@ -52,6 +52,6 @@ We introduced a new deployment type called **ProvisionedManaged** which provides
 
 Provisioned throughput quota represents a specific amount of total throughput you can deploy. Quota in the Azure OpenAI Service is managed at the subscription level meaning that it can be consumed by different resources within that subscription.
 
-Quota is specific to a (deployment type, mode, region) triplet and isn't interchangeable. Meaning you can't use quota for GPT-4 to deploy GPT-35-turbo. Customers can raise a support request to move the quota across deployment types, models, or regions but we can't guarantee that it will be possible.
+Quota is specific to a (deployment type, model, region) triplet and isn't interchangeable. Meaning you can't use quota for GPT-4 to deploy GPT-35-turbo. Customers can raise a support request to move the quota across deployment types, models, or regions but we can't guarantee that it will be possible.
 
 While we make every attempt to ensure that quota is always deployable, quota does not represent a guarantee that the underlying capacity is available for the customer to use. The service assigns capacity to the customer at deployment time and if capacity is unavailable the deployment will fail with an out of capacity error.
diff --git a/articles/aks/azure-cni-overlay.md b/articles/aks/azure-cni-overlay.md
@@ -29,23 +29,6 @@ You can provide outbound (egress) connectivity to the internet for Overlay pods
 
 You can configure ingress connectivity to the cluster using an ingress controller, such as Nginx or [HTTP application routing](./http-application-routing.md). You cannot configure ingress connectivity using Azure App Gateway. For details see [Limitations with Azure CNI Overlay](#limitations-with-azure-cni-overlay).
 
-## Limitations
-
-Azure CNI Overlay networking in AKS currently has the following limitations:
-
-* In case you are using your own subnet to deploy the cluster, the names of the subnet, VNET and resource group which contains the VNET, must be 63 characters or less. This comes from the fact that these names will be used as labels in AKS worker nodes, and are therefore subjected to [Kubernetes label syntax rules](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set).  
-
-## Regional availability for ARM64 node pools
-
-Azure CNI Overlay is currently unavailable for ARM64 node pools in the following regions:
-
-- East US 2
-- France Central
-- Southeast Asia
-- South Central US
-- West Europe
-- West US 3
-
 ## Differences between Kubenet and Azure CNI Overlay
 
 Like Azure CNI Overlay, Kubenet assigns IP addresses to pods from an address space logically different from the VNet, but it has scaling and other limitations. The below table provides a detailed comparison between Kubenet and Azure CNI Overlay. If you don't want to assign VNet IP addresses to pods due to IP shortage, we recommend using Azure CNI Overlay.
diff --git a/articles/aks/cluster-autoscaler.md b/articles/aks/cluster-autoscaler.md
@@ -181,7 +181,6 @@ You can also configure more granular details of the cluster autoscaler by changi
 | daemonset-eviction-for-occupied-nodes (Preview) | Whether DaemonSet pods will be gracefully terminated from non-empty nodes | true |
 | scale-down-utilization-threshold | Node utilization level, defined as sum of requested resources divided by capacity, in which a node can be considered for scale down | 0.5 |
 | max-graceful-termination-sec     | Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node | 600 seconds   |
-| balance-similar-node-groups | Detects similar node pools and balances the number of nodes between them | false |
 | balance-similar-node-groups      | Detects similar node pools and balances the number of nodes between them                 | false         |
 | expander                         | Type of node pool [expander](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders) to be used in scale up. Possible values: `most-pods`, `random`, `least-waste`, `priority` | random |
 | skip-nodes-with-local-storage    | If true, cluster autoscaler doesn't delete nodes with pods with local storage, for example, EmptyDir or HostPath | true |
diff --git a/articles/app-service/configure-ssl-certificate.md b/articles/app-service/configure-ssl-certificate.md
@@ -75,6 +75,7 @@ The free certificate comes with the following limitations:
 - Isn't exportable.
 - Isn't supported in an App Service Environment (ASE).
 - Only supports alphanumeric characters, dashes (-), and periods (.).
+- Only custom domains of length up to 64 characters are supported. 
 
 ### [Apex domain](#tab/apex)
 - Must have an A record pointing to your web app's IP address.
diff --git a/articles/container-apps/azure-arc-create-container-app.md b/articles/container-apps/azure-arc-create-container-app.md
@@ -91,7 +91,7 @@ The following example creates a Node.js app.
     --name $myContainerApp \
     --environment $myConnectedEnvironment \
     --environment-type connected \
-    --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+    --image mcr.microsoft.com/k8se/quickstart:latest \
     --target-port 80 \
     --ingress 'external'
 
diff --git a/articles/container-apps/get-started-existing-container-image.md b/articles/container-apps/get-started-existing-container-image.md
@@ -195,7 +195,7 @@ New-AzContainerApp @ContainerAppArgs
 
 ---
 
-Before you run this command, replace `<REGISTRY_CONTAINER_NAME>` with the full name the public container registry location, including the registry path and tag. For example, a valid container name is `mcr.microsoft.com/azuredocs/containerapps-helloworld:latest`.
+Before you run this command, replace `<REGISTRY_CONTAINER_NAME>` with the full name the public container registry location, including the registry path and tag. For example, a valid container name is `mcr.microsoft.com/k8se/quickstart:latest`.
 
 ::: zone-end
 
diff --git a/articles/container-apps/get-started.md b/articles/container-apps/get-started.md
@@ -125,7 +125,7 @@ az containerapp up \
   --resource-group my-container-apps \
   --location centralus \
   --environment 'my-container-apps' \
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+  --image mcr.microsoft.com/k8se/quickstart:latest \
   --target-port 80 \
   --ingress external \
   --query properties.configuration.ingress.fqdn
@@ -139,7 +139,7 @@ az containerapp up `
   --resource-group my-container-apps `
   --location centralus `
   --environment  my-container-apps `
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest `
+  --image mcr.microsoft.com/k8se/quickstart:latest `
   --target-port 80 `
   --ingress external `
   --query properties.configuration.ingress.fqdn
diff --git a/articles/container-apps/managed-identity-image-pull.md b/articles/container-apps/managed-identity-image-pull.md
@@ -552,7 +552,7 @@ az containerapp create \
   --name $CONTAINERAPP_NAME \
   --resource-group $RESOURCE_GROUP \
   --environment $CONTAINERAPPS_ENVIRONMENT \
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+  --image mcr.microsoft.com/k8se/quickstart:latest \
   --target-port 80 \
   --ingress external
 ```
@@ -562,7 +562,7 @@ az containerapp create \
 ```powershell
 $ImageParams = @{
     Name = "my-container-app"
-    Image = "mcr.microsoft.com/azuredocs/containerapps-helloworld:latest"
+    Image = "mcr.microsoft.com/k8se/quickstart:latest"
 }
 $TemplateObj = New-AzContainerAppTemplateObject @ImageParams
 $EnvId = (Get-AzContainerAppManagedEnv -EnvName $ContainerAppsEnvironment -ResourceGroupName $ResourceGroupName).Id
diff --git a/articles/container-apps/revisions-manage.md b/articles/container-apps/revisions-manage.md
@@ -42,7 +42,7 @@ Replace the \<Placeholders\> with your values.
 ```azurepowershell
 $ImageParams = @{
     Name = '<ContainerName>'
-    Image = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
+    Image = 'mcr.microsoft.com/k8se/quickstart'
 }
 $TemplateObj = New-AzContainerAppTemplateObject @ImageParams
 
diff --git a/articles/container-apps/tutorial-deploy-first-app-cli.md b/articles/container-apps/tutorial-deploy-first-app-cli.md
@@ -85,7 +85,7 @@ az containerapp create \
   --name my-container-app \
   --resource-group $RESOURCE_GROUP \
   --environment $CONTAINERAPPS_ENVIRONMENT \
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+  --image mcr.microsoft.com/k8se/quickstart:latest \
   --target-port 80 \
   --ingress 'external' \
   --query properties.configuration.ingress.fqdn
@@ -101,7 +101,7 @@ By setting `--ingress` to `external`, you make the container app available to pu
 ```azurepowershell
 $ImageParams = @{
     Name = 'my-container-app'
-    Image = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
+    Image = 'mcr.microsoft.com/k8se/quickstart:latest'
 }
 $TemplateObj = New-AzContainerAppTemplateObject @ImageParams
 $EnvId = (Get-AzContainerAppManagedEnv -EnvName $ContainerAppsEnvironment -ResourceGroupName $ResourceGroupName).Id
diff --git a/articles/container-apps/tutorial-scaling.md b/articles/container-apps/tutorial-scaling.md
@@ -120,7 +120,7 @@ az containerapp up \
   --resource-group my-container-apps \
   --location centralus \
   --environment 'my-container-apps' \
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+  --image mcr.microsoft.com/k8se/quickstart:latest \
   --target-port 80 \
   --ingress external \
   --query properties.configuration.ingress.fqdn \
@@ -134,7 +134,7 @@ az containerapp up `
   --resource-group my-container-apps `
   --location centralus `
   --environment my-container-apps `
-  --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest `
+  --image mcr.microsoft.com/k8se/quickstart:latest `
   --target-port 80 `
   --ingress external  `
   --query properties.configuration.ingress.fqdn `
diff --git a/articles/container-apps/workload-profiles-manage-cli.md b/articles/container-apps/workload-profiles-manage-cli.md
@@ -152,7 +152,7 @@ Use the following commands to create a workload profiles environment.
         --name "<CONTAINER_APP_NAME>" \
         --target-port 80 \
         --ingress external \
-        --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+        --image mcr.microsoft.com/k8se/quickstart:latest \
         --environment "<ENVIRONMENT_NAME>" \
         --workload-profile-name "Consumption"
       ```
@@ -165,7 +165,7 @@ Use the following commands to create a workload profiles environment.
         --name "<CONTAINER_APP_NAME>" \
         --target-port 80 \
         --ingress internal \
-        --image mcr.microsoft.com/azuredocs/containerapps-helloworld:latest \
+        --image mcr.microsoft.com/k8se/quickstart:latest \
         --environment "<ENVIRONMENT_NAME>" \
         --workload-profile-name "Consumption"
       ```
diff --git a/articles/synapse-analytics/sql-data-warehouse/maintenance-scheduling.md b/articles/synapse-analytics/sql-data-warehouse/maintenance-scheduling.md
@@ -4,7 +4,7 @@ description: Maintenance scheduling enables customers to plan around the necessa
 author: sowmi93
 ms.author: sosivara
 ms.reviewer: sngun
-ms.date: 11/28/2022
+ms.date: 01/10/2024
 ms.service: synapse-analytics
 ms.subservice: sql-dw
 ms.topic: conceptual
@@ -57,7 +57,8 @@ To view the maintenance schedule that has been applied to your Synapse SQL pool,
 
 ## Skip or change maintenance schedule
 
-To ensure compliance with latest security requirements, we are unable to accommodate requests to skip or delay these updates. However, you may have some options to adjust your maintenance window within the current cycle depending on your situation:
+To ensure compliance with latest security requirements, we are unable to accommodate requests to skip or delay these updates. However, you may have some options to adjust your maintenance window if you are using DW500c and higher
+data warehouse tiers within the current cycle depending on your situation:
 - If you receive a pending notification for maintenance, and you need more time to finish your jobs or notify your team, you can change the window start time as long as you do so before the beginning of your defined maintenance window. This will shift your window forward in time within the cycle.
 
 - You can manually trigger the maintenance by pausing and resuming (or scaling) your SQL Dedicated pool after the start of a cycle for which a "Pending" notification has been received. The weekend maintenance cycle starts on Saturday at 00:00 UTC; the midweek maintenance cycle starts Tuesday at 12:00 UTC.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ Replace the \<Placeholders\> with your values.`
`42`	`42`	```azurepowershell
`43`	`43`	`$ImageParams = @{`
`44`	`44`	`Name = '<ContainerName>'`
`45`		`- Image = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'`
	`45`	`+ Image = 'mcr.microsoft.com/k8se/quickstart'`
`46`	`46`	`}`
`47`	`47`	`$TemplateObj = New-AzContainerAppTemplateObject @ImageParams`
`48`	`48`