Merge pull request #292198 from craigshoemaker/aca/jason/combine-custom-vnet

[Container Apps] Combine custom Vnet articles (Jason)

Author: v-dirichards

articles/container-apps/.openpublishing.redirection.container-apps.json

@@ -109,6 +109,11 @@
             "source_path_from_root": "/articles/container-apps/tutorial-dev-services-postgresql.md",
             "redirect_url": "/azure/container-apps/services",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-apps/vnet-custom-internal.md",
+            "redirect_url": "/azure/container-apps/vnet-custom",
+            "redirect_document_id": false
         }
     ]
 }

articles/container-apps/TOC.yml

@@ -294,12 +294,8 @@
   items:
     - name: Architecture overview
       href: networking.md
-    - name: Environments
-      items:
-        - name: Deploy with an external environment
-          href: vnet-custom.md
-        - name: Deploy with an internal environment
-          href: vnet-custom-internal.md
+    - name: Use a custom virtual network
+      href: vnet-custom.md
     - name: Ingress
       items:
         - name: Overview
@@ -333,8 +329,6 @@
           href: how-to-use-private-endpoint.md
         - name: Integrate with Azure Front Door
           href: how-to-integrate-with-azure-front-door.md
-    - name: Use a custom VNET
-      href: vnet-custom.md
 - name: Languages and runtimes
   items:
     - name: .NET

articles/container-apps/networking.md

@@ -15,7 +15,7 @@ ms.author: cshoe
 
 Azure Container Apps run in the context of an [environment](environment.md), with its own virtual network (VNet).
 
-By default, your Container App environment is created with a VNet that is automatically generated for you. For fine-grained control over your network, you can provide an existing VNet when you create an environment. Once you create an environment with either a generated or existing VNet, the network type can't be changed.
+By default, your Container App environment is created with a VNet that is automatically generated for you. For fine-grained control over your network, you can provide an [existing VNet](vnet-custom.md) when you create an environment. Once you create an environment with either a generated or existing VNet, the network type can't be changed.
 
 Generated VNets take on the following characteristics.
 
@@ -50,22 +50,22 @@ Depending on your virtual IP configuration, you can control whether your contain
 
 | Accessibility level | Description |
 |---|---|
-| [External](vnet-custom.md) | Allows your container app to accept public requests. External environments are deployed with a virtual IP on an external, internet-accessible IP address. |
-| [Internal](vnet-custom-internal.md) | Internal environments have no public endpoints and are deployed with a virtual IP (VIP) mapped to an internal IP address. The internal endpoint is an Azure internal load balancer (ILB) and IP addresses are issued from the custom VNet's list of private IP addresses. |
+| External | Allows your container app to accept public requests. External environments are deployed with a virtual IP on an external, internet-accessible IP address. |
+| Internal | Internal environments have no public endpoints and are deployed with a virtual IP (VIP) mapped to an internal IP address. The internal endpoint is an Azure internal load balancer (ILB) and IP addresses are issued from the custom VNet's list of private IP addresses. |
 
 ## Custom VNet configuration
 
 As you create a custom VNet, keep in mind the following situations:
 
-- If you want your container app to restrict all outside access, create an [internal Container Apps environment](vnet-custom-internal.md).
+- If you want your container app to restrict all outside access, create an internal Container Apps environment.
 
 - If you use your own VNet, you need to provide a subnet that is dedicated exclusively to the Container App environment you deploy. This subnet isn't available to other services.
 
 - Network addresses are assigned from a subnet range you define as the environment is created.
 
   - You can define the subnet range used by the Container Apps environment.
 
-  - You can restrict inbound requests to the environment exclusively to the VNet by deploying the environment as [internal](vnet-custom-internal.md).
+  - You can restrict inbound requests to the environment exclusively to the VNet by deploying the environment as internal.
 
 > [!NOTE]
 > When you provide your own virtual network, additional [managed resources](networking.md#managed-resources) are created. These resources incur costs at their associated rates.
@@ -208,7 +208,7 @@ As a Container Apps environment is created, you provide resource IDs for a singl
 
 If you're using the CLI, the parameter to define the subnet resource ID is `infrastructure-subnet-resource-id`. The subnet hosts infrastructure components and user app containers.
 
-If you're using the Azure CLI with a Consumption only environment and the [platformReservedCidr](vnet-custom-internal.md?pivots=azure-cli&tabs=bash#networking-parameters) range is defined, the subnet must not overlap with the IP range defined in `platformReservedCidr`.
+If you're using the Azure CLI with a Consumption only environment and the [platformReservedCidr](vnet-custom.md#networking-parameters) range is defined, the subnet must not overlap with the IP range defined in `platformReservedCidr`.
 
 ## Routes
 
@@ -429,5 +429,4 @@ In addition to the standard [Azure Container Apps billing](./billing.md), you're
 
 ## Next steps
 
-- [Deploy with an external environment](vnet-custom.md)
-- [Deploy with an internal environment](vnet-custom-internal.md)
+- [Use a custom virtual network](vnet-custom.md)

articles/container-apps/tutorial-ci-cd-runners-jobs.md

@@ -125,7 +125,7 @@ $PLACEHOLDER_JOB_NAME="placeholder-agent-job"
 The Azure Container Apps environment acts as a secure boundary around container apps and jobs so they can share the same network and communicate with each other.
 
 > [!NOTE]
-> To create a Container Apps environment that's integrated with an existing virtual network, see [Provide a virtual network to an internal Azure Container Apps environment](vnet-custom-internal.md?tabs=bash).
+> To create a Container Apps environment that's integrated with an existing virtual network, see [Provide a virtual network to an Azure Container Apps environment](vnet-custom.md).
 
 1. Create a resource group using the following command.