Skip to content

Commit 87c2c76

Browse files
authored
Merge pull request #251946 from MicrosoftDocs/main
9/18/2023 PM Publish
2 parents bc5aee4 + 6f01a8e commit 87c2c76

File tree

257 files changed

+2997
-2520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+2997
-2520
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23591,13 +23591,27 @@
2359123591
"source_path_from_root": "/articles/devtest-labs/how-to-move-schedule-to-new-region.md",
2359223592
"redirect_url": "/azure/devtest-labs/how-to-move-labs",
2359323593
"redirect_document_id": false
23594-
},
23594+
},
2359523595
{
2359623596
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-prescriptive-adoption.md",
2359723597
"redirect_url": "/azure/devtest-labs/deliver-proof-of-concept",
2359823598
"redirect_document_id": false
2359923599
},
2360023600
{
23601+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-cost-ownership.md",
23602+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
23603+
"redirect_document_id": false
23604+
},
23605+
{
23606+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-policy-compliance.md",
23607+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
23608+
"redirect_document_id": false
23609+
},
23610+
{
23611+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-application-migration-integration.md",
23612+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
23613+
"redirect_document_id": false
23614+
}, {
2360123615
"source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
2360223616
"redirect_url": "/azure/advisor/advisor-overview",
2360323617
"redirect_document_id": false

articles/active-directory/governance/apps.md

Lines changed: 30 additions & 2 deletions
Large diffs are not rendered by default.

articles/aks/gpu-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ You can deploy a DaemonSet for the NVIDIA device plugin, which runs a pod on eac
188188
value: "gpu"
189189
effect: "NoSchedule"
190190
containers:
191-
- image: mcr.microsoft.com/oss/nvidia/k8s-device-plugin:1.11
191+
- image: mcr.microsoft.com/oss/nvidia/k8s-device-plugin:v0.14.1
192192
name: nvidia-device-plugin-ctr
193193
securityContext:
194194
allowPrivilegeEscalation: false

articles/aks/http-proxy.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.subservice: aks-networking
55
ms.custom: devx-track-arm-template, devx-track-azurecli
66
author: asudbring
77
ms.topic: how-to
8-
ms.date: 02/01/2023
8+
ms.date: 09/18/2023
99
ms.author: allensu
1010
---
1111

@@ -22,7 +22,6 @@ Some more complex solutions may require creating a chain of trust to establish s
2222
The following scenarios are **not** supported:
2323

2424
- Different proxy configurations per node pool
25-
- Updating HTTP/HTTPS proxy settings post cluster creation
2625
- User/Password authentication
2726
- Custom CAs for API server communication
2827
- Windows-based clusters
@@ -109,7 +108,10 @@ In your template, provide values for *httpProxy*, *httpsProxy*, and *noProxy*. I
109108

110109
## Updating Proxy configurations
111110

112-
Values for *httpProxy*, and *httpsProxy* can't be changed after cluster creation. However, the values for *trustedCa* and *NoProxy* can be changed and applied to the cluster with the [az aks update][az-aks-update] command. An aks update for *NoProxy* will automatically inject new environment variables into pods with the new *NoProxy* values. Pods must be rotated for the apps to pick it up. For components under kubernetes, like containerd and the node itself, this won't take effect until a node image upgrade is performed.
111+
> [!NOTE]
112+
> If switching to a new proxy, the new proxy must already exist for the update to be successful. Then, after the upgrade is completed the old proxy can be deleted.
113+
114+
Values for *httpProxy*, *httpsProxy*, *trustedCa* and *NoProxy* can be changed and applied to the cluster with the [az aks update][az-aks-update] command. An aks update for *httpProxy*, *httpsProxy*, and/or *NoProxy* will automatically inject new environment variables into pods with the new *httpProxy*, *httpsProxy*, or *NoProxy* values. Pods must be rotated for the apps to pick it up. For components under kubernetes, like containerd and the node itself, this won't take effect until a node image upgrade is performed.
113115

114116
For example, assuming a new file has been created with the base64 encoded string of the new CA cert called *aks-proxy-config-2.json*, the following action updates the cluster. Or, you need to add new endpoint urls for your applications to No Proxy:
115117

articles/app-service/configure-vnet-integration-enable.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ If the virtual network is in a different subscription than the app, you must ens
2727

2828
## Configure in the Azure portal
2929

30-
1. Go to **Networking** in the App Service portal. Under **Outbound Traffic**, select **VNet integration**.
30+
1. Go to **Networking** in the App Service portal. Under **Outbound traffic configuration**, select **Virtual network integration**.
3131

32-
1. Select **Add VNet**.
32+
1. Select **Add virtual network integration**.
3333

34-
:::image type="content" source="./media/configure-vnet-integration-enable/vnetint-app.png" alt-text="Screenshot that shows selecting VNet integration.":::
34+
:::image type="content" source="./media/configure-vnet-integration-enable/vnetint-app.png" alt-text="Screenshot that shows selecting Virtual network integration.":::
3535

3636
1. The dropdown list contains all the virtual networks in your subscription in the same region. Select an empty pre-existing subnet or create a new subnet.
3737

articles/app-service/configure-vnet-integration-routing.md

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@ ms.date: 10/20/2021
99

1010
# Manage Azure App Service virtual network integration routing
1111

12-
Through application routing or configuration routing options, you can configure what traffic will be sent through the virtual network integration. See the [overview section](./overview-vnet-integration.md#routes) for more details.
12+
Through application routing or configuration routing options, you can configure what traffic is sent through the virtual network integration. For more information, see the [overview section](./overview-vnet-integration.md#routes).
1313

1414
## Prerequisites
1515

1616
Your app is already integrated using the regional virtual network integration feature.
1717

1818
## Configure application routing
1919

20-
Application routing defines what traffic is routed from your app and into the virtual network. We recommend that you use the **Route All** site setting to enable routing of all traffic. Using the configuration setting allows you to audit the behavior with [a built-in policy](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F33228571-70a4-4fa1-8ca1-26d0aba8d6ef). The existing `WEBSITE_VNET_ROUTE_ALL` app setting can still be used, and you can enable all traffic routing with either setting.
20+
Application routing defines what traffic is routed from your app and into the virtual network. We recommend that you use the `vnetRouteAllEnabled` site setting to enable routing of all traffic. Using the configuration setting allows you to audit the behavior with [a built-in policy](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F33228571-70a4-4fa1-8ca1-26d0aba8d6ef). The existing `WEBSITE_VNET_ROUTE_ALL` app setting can still be used, and you can enable all traffic routing with either setting.
2121

2222
### Configure in the Azure portal
2323

24-
Follow these steps to disable **Route All** in your app through the portal.
24+
Follow these steps to disable outbound internet traffic routing in your app through the portal.
2525

26-
:::image type="content" source="./media/configure-vnet-integration-routing/vnetint-route-all-enabled.png" alt-text="Screenshot that shows enabling Route All.":::
26+
:::image type="content" source="./media/configure-vnet-integration-routing/vnetint-route-all-enabled.png" alt-text="Screenshot that shows enabling outbound internet traffic.":::
2727

28-
1. Go to **Networking** > **VNet integration** in your app portal.
29-
1. Set **Route All** to **Disabled**.
28+
1. Go to **Networking** > **Virtual network integration** in your app portal.
29+
1. Uncheck the **Outbound internet traffic** setting.
3030

31-
:::image type="content" source="./media/configure-vnet-integration-routing/vnetint-route-all-disabling.png" alt-text="Screenshot that shows disabling Route All.":::
31+
:::image type="content" source="./media/configure-vnet-integration-routing/vnetint-route-all-disabling.png" alt-text="Screenshot that shows disabling outbound internet traffic.":::
3232

33-
1. Select **Yes** to confirm.
33+
1. Select **Apply** to confirm.
3434

3535
### Configure with the Azure CLI
3636

37-
You can also configure **Route All** by using the Azure CLI.
37+
You can also configure **Outbound internet traffic** by using the Azure CLI.
3838

3939
```azurecli-interactive
40-
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetRouteAllEnabled [true|false]
40+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetRouteAllEnabled=[true|false]
4141
```
4242

4343
## Configure configuration routing
4444

45-
When you're using virtual network integration, you can configure how parts of the configuration traffic are managed. By default, configuration traffic will go directly over the public route, but for the mentioned individual components, you can actively configure it to be routed through the virtual network integration.
45+
When you're using virtual network integration, you can configure how parts of the configuration traffic are managed. By default, configuration traffic goes directly over the public route, but for the mentioned individual components, you can actively configure it to be routed through the virtual network integration.
4646

4747
### Container image pull
4848

4949
Routing container image pull over virtual network integration can be configured using the Azure CLI.
5050

5151
```azurecli-interactive
52-
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetImagePullEnabled [true|false]
52+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetImagePullEnabled=[true|false]
5353
```
5454

5555
We recommend that you use the site property to enable routing image pull traffic through the virtual network integration. Using the configuration setting allows you to audit the behavior with Azure Policy. The existing `WEBSITE_PULL_IMAGE_OVER_VNET` app setting with the value `true` can still be used, and you can enable routing through the virtual network with either setting.
@@ -59,11 +59,19 @@ We recommend that you use the site property to enable routing image pull traffic
5959
Routing content share over virtual network integration can be configured using the Azure CLI. In addition to enabling the feature, you must also ensure that any firewall or Network Security Group configured on traffic from the subnet allow traffic to port 443 and 445.
6060

6161
```azurecli-interactive
62-
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetContentShareEnabled [true|false]
62+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetContentShareEnabled=[true|false]
6363
```
6464

6565
We recommend that you use the site property to enable content share traffic through the virtual network integration. Using the configuration setting allows you to audit the behavior with Azure Policy. The existing `WEBSITE_CONTENTOVERVNET` app setting with the value `1` can still be used, and you can enable routing through the virtual network with either setting.
6666

67+
### Backup/restore
68+
69+
Routing backup traffic over virtual network integration can be configured using the Azure CLI. Database backup isn't supported over the virtual network integration.
70+
71+
```azurecli-interactive
72+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --set properties.vnetBackupRestoreEnabled=[true|false]
73+
```
74+
6775
## Next steps
6876

6977
- [Enable virtual network integration](./configure-vnet-integration-enable.md)
6.73 KB
Loading
9.62 KB
Loading
36.1 KB
Loading
40.8 KB
Loading

0 commit comments

Comments
 (0)