Skip to content

Commit 3d04268

Browse files
authored
Merge pull request #293098 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents f476a5c + 103068c commit 3d04268

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

articles/container-apps/how-to-use-private-endpoint.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.custom: devx-track-azurepowershell, devx-track-azurecli, ignite-2024
88
ms.topic: how-to
9-
ms.date: 11/6/2024
9+
ms.date: 1/14/2025
1010
ms.author: cshoe
1111
zone_pivot_groups: azure-cli-or-portal
1212
---
@@ -127,8 +127,8 @@ RESOURCE_GROUP="my-container-apps"
127127
LOCATION="centralus"
128128
ENVIRONMENT_NAME="my-environment"
129129
CONTAINERAPP_NAME="my-container-app"
130-
VNET_NAME="my-custom-vnet"
131-
SUBNET_NAME="my-custom-subnet"
130+
VNET_NAME="my-vnet"
131+
SUBNET_NAME="my-subnet"
132132
PRIVATE_ENDPOINT="my-private-endpoint"
133133
PRIVATE_ENDPOINT_CONNECTION="my-private-endpoint-connection"
134134
PRIVATE_DNS_ZONE="privatelink.${LOCATION}.azurecontainerapps.io"
@@ -147,10 +147,7 @@ az group create \
147147

148148
## Create a virtual network
149149

150-
An environment in Azure Container Apps creates a secure boundary around a group of container apps. Container Apps deployed to the same environment are deployed in the same virtual network and write logs to the same Log Analytics workspace.
151-
152-
1. Create an Azure virtual network (VNet) to associate with the Container Apps environment. The VNet must have a subnet available for the environment deployment.
153-
You can use an existing VNet, but private endpoints are only supported by workload profiles environments, which require a subnet with a minimum CIDR range of `/27` or larger. To learn more about subnet sizing, see the [networking architecture overview](./networking.md#subnet).
150+
1. Create an Azure virtual network (VNet). You can use an existing VNet, but private endpoints are only supported by workload profiles environments, which require a subnet with a minimum CIDR range of `/27` or larger. To learn more about subnet sizing, see the [networking architecture overview](./networking.md#subnet).
154151

155152
```azurecli
156153
az network vnet create \
@@ -183,7 +180,7 @@ An environment in Azure Container Apps creates a secure boundary around a group
183180
184181
## Create an environment
185182
186-
1. Create the Container Apps environment using the VNet deployed in the preceding steps. Private endpoints are only supported by workload profiles environments, which is the default type for new environments.
183+
1. Create the Container Apps environment. Private endpoints are only supported by workload profiles environments, which is the default type for new environments.
187184
188185
```azurecli
189186
az containerapp env create \
@@ -417,7 +414,7 @@ The administrator password has the following requirements:
417414
418415
## Clean up resources
419416
420-
If you're not going to continue to use this application, you can remove the **my-container-apps** resource group. This deletes the Azure Container Apps instance and all associated services. It also deletes the resource group that the Container Apps service automatically created and which contains the custom network components.
417+
If you're not going to continue to use this application, you can remove the **my-container-apps** resource group. This deletes the Azure Container Apps instance and all associated services.
421418
422419
::: zone pivot="azure-cli"
423420

articles/expressroute/expressroute-howto-circuit-arm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Review the instructions in [Move ExpressRoute circuits from the classic to the R
445445

446446
Note the following information:
447447

448-
* All virtual networks must be unlinked from the ExpressRoute circuit. If this operation fails, check to see if any virtual networks are linked to the circuit.
448+
* All virtual networks, route filters, authorizations, and global reach associations must be unlinked from the ExpressRoute circuit. If this operation fails, check to see if any virtual networks are linked to the circuit.
449449
* If the ExpressRoute circuit service provider provisioning state is **Provisioning** or **Provisioned** you must work with your service provider to deprovision the circuit on their side. We continue to reserve resources and bill you until the service provider completes deprovisioning the circuit and notifies us.
450450
* If the service provider deprovisioned the circuit, meaning the service provider provisioning state gets set to **Not provisioned**, you can delete the circuit. The billing for the circuit stops.
451451

articles/expressroute/expressroute-howto-circuit-portal-resource-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ To modify an ExpressRoute circuit, select **Configuration**.
212212
:::image type="content" source="./media/expressroute-howto-circuit-portal-resource-manager/expressroute-deprovisioned.png" alt-text="Screenshot of a deprovisioned circuit.":::
213213

214214
> [!NOTE]
215-
>* You must delete all associated [Virtual Network connections](expressroute-howto-linkvnet-portal-resource-manager.md#clean-up-resources), [Authorizations](expressroute-howto-linkvnet-portal-resource-manager.md#circuit-owner-operations), and [Global Reach](expressroute-howto-set-global-reach-portal.md#disable-connectivity) from the ExpressRoute circuit before deprovisioning. If deprovisioning fails, check whether any associated resources are still linked to the circuit.
215+
>* You must delete all associated [Virtual Network connections](expressroute-howto-linkvnet-portal-resource-manager.md#clean-up-resources), [Route Filter](how-to-routefilter-portal.md#clean-up-resources), [Authorizations](expressroute-howto-linkvnet-portal-resource-manager.md#circuit-owner-operations), and [Global Reach](expressroute-howto-set-global-reach-portal.md#disable-connectivity) from the ExpressRoute circuit before deprovisioning. If deprovisioning fails, check whether any associated resources are still linked to the circuit.
216216
>* If the circuit service provider has deprovisioned the circuit (The *Provider status* has updated to **Not provisioned**), you can delete the circuit. This stops billing for the circuit.
217217
218218
## Next steps

articles/expressroute/howto-circuit-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ Review the instructions in [Move ExpressRoute circuits from the classic to the R
339339

340340
To deprovision and delete an ExpressRoute circuit, make sure you understand the following criteria:
341341

342-
* All virtual networks must be unlinked from the ExpressRoute circuit. If this operation fails, check to see if any virtual networks are linked to the circuit.
342+
* All virtual networks, route filters, authorizations, and global reach associations must be unlinked from the ExpressRoute circuit. If this operation fails, check to see if any virtual networks are linked to the circuit.
343343
* If the ExpressRoute circuit service provider provisioning state is **Provisioning** or **Provisioned** you must work with your service provider to deprovision the circuit on their side. We continue to reserve resources and bill you until the service provider completes deprovisioning the circuit and notifies us.
344344
* If the service provider has deprovisioned the circuit meaning the service provider provisioning state gets set to **Not provisioned**, you can delete the circuit. The billing for the circuit stop.
345345

0 commit comments

Comments
 (0)