Skip to content

Commit ca06fc9

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into wafupdate0529
2 parents 60bee12 + d381e37 commit ca06fc9

22 files changed

+48
-26
lines changed

articles/active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Before you can associate or add your subscription, you must perform the followin
3838
- Users that have been assigned roles using RBAC will lose their access
3939
- Service Administrator and Co-Administrators will lose access
4040
- If you have any key vaults, they'll be inaccessible and you'll have to fix them after association
41+
- If you have any managed identities for resources such as Virtual Machines or Logic Apps, you'll have to re-enable or recreate them after the association
4142
- If you have a registered Azure Stack, you'll have to re-register it after association
4243

4344
1. Sign in using an account that:
@@ -72,7 +73,9 @@ After you associate a subscription to a different directory, there might be addi
7273

7374
1. If you have any key vaults, you must change the key vault tenant ID. For more information, see [Change a key vault tenant ID after a subscription move](../../key-vault/key-vault-subscription-move-fix.md).
7475

75-
2. If you have registered an Azure Stack using this subscription, you must re-register. For more information, see [Register Azure Stack with Azure](/azure-stack/operator/azure-stack-registration).
76+
2. If you were using system-assigned Managed Identities for resources, you must re-enable these. If you were using user-assigned Managed Identities, you must re-create these. After re-enabling or recreating the Managed Identities, you must re-establish the permissions assigned to those identities. For more information see [What is managed identities for Azure resources?](../managed-identities-azure-resources/overview.md).
77+
78+
3. If you have registered an Azure Stack using this subscription, you must re-register. For more information, see [Register Azure Stack with Azure](/azure-stack/operator/azure-stack-registration).
7679

7780

7881

articles/aks/concepts-network.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ In AKS, you can create an Ingress resource using something like NGINX, or use th
9696

9797
Another common feature of Ingress is SSL/TLS termination. On large web applications accessed via HTTPS, the TLS termination can be handled by the Ingress resource rather than within the application itself. To provide automatic TLS certification generation and configuration, you can configure the Ingress resource to use providers such as Let's Encrypt. For more information on configuring an NGINX Ingress controller with Let's Encrypt, see [Ingress and TLS][aks-ingress-tls].
9898

99+
You can also configure your ingress controller to preserve the client source IP on requests to containers in your AKS cluster. When a client's request is routed to a container in your AKS cluster via your ingress controller, the original source ip of that request will not be available to the target container. When you enable *client source IP preservation*, the source IP for the client is available in the request header under *X-Forwarded-For*. If you are using client source IP preservation on your ingress controller, you cannot use SSL pass-through. Client source IP preservation and SSL pass-through can be used with other services, such as the *LoadBalancer* type.
100+
99101
## Network security groups
100102

101103
A network security group filters traffic for VMs, such as the AKS nodes. As you create Services, such as a LoadBalancer, the Azure platform automatically configures any network security group rules that are needed. Don't manually configure network security group rules to filter traffic for pods in an AKS cluster. Define any required ports and forwarding as part of your Kubernetes Service manifests, and let the Azure platform create or update the appropriate rules. You can also use network policies, as discussed in the next section, to automatically apply traffic filter rules to pods.

articles/aks/ingress-basic.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
3838
> [!TIP]
3939
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not RBAC enabled, add `--set rbac.create=false` to the Helm commands.
4040
41+
> [!TIP]
42+
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
43+
4144
```console
4245
# Create a namespace for your ingress resources
4346
kubectl create namespace ingress-basic
@@ -222,3 +225,4 @@ You can also:
222225
[aks-ingress-static-tls]: ingress-static-ip.md
223226
[aks-http-app-routing]: http-application-routing.md
224227
[aks-ingress-own-tls]: ingress-own-tls.md
228+
[client-source-ip]: concepts-network.md#ingress-controllers

articles/aks/ingress-internal-ip.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
5050
> [!TIP]
5151
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not RBAC enabled, add `--set rbac.create=false` to the Helm commands.
5252

53+
> [!TIP]
54+
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
55+
5356
```console
5457
# Create a namespace for your ingress resources
5558
kubectl create namespace ingress-basic
@@ -271,3 +274,4 @@ You can also:
271274
[aks-ingress-static-tls]: ingress-static-ip.md
272275
[aks-http-app-routing]: http-application-routing.md
273276
[aks-ingress-own-tls]: ingress-own-tls.md
277+
[client-source-ip]: concepts-network.md#ingress-controllers

articles/aks/ingress-own-tls.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
3838
> [!TIP]
3939
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not RBAC enabled, add `--set rbac.create=false` to the Helm commands.
4040
41+
> [!TIP]
42+
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
43+
4144
```console
4245
# Create a namespace for your ingress resources
4346
kubectl create namespace ingress-basic
@@ -311,3 +314,4 @@ You can also:
311314
[aks-ingress-basic]: ingress-basic.md
312315
[aks-http-app-routing]: http-application-routing.md
313316
[aks-ingress-tls]: ingress-tls.md
317+
[client-source-ip]: concepts-network.md#ingress-controllers

articles/aks/ingress-static-ip.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
5656
> [!TIP]
5757
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not RBAC enabled, add `--set rbac.create=false` to the Helm commands.
5858
59+
> [!TIP]
60+
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
61+
5962
```console
6063
# Create a namespace for your ingress resources
6164
kubectl create namespace ingress-basic
@@ -420,4 +423,5 @@ You can also:
420423
[aks-ingress-own-tls]: ingress-own-tls.md
421424
[aks-quickstart-cli]: kubernetes-walkthrough.md
422425
[aks-quickstart-portal]: kubernetes-walkthrough-portal.md
426+
[client-source-ip]: concepts-network.md#ingress-controllers
423427
[install-azure-cli]: /cli/azure/install-azure-cli

articles/aks/ingress-tls.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
4343
> [!TIP]
4444
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not RBAC enabled, add `--set rbac.create=false` to the Helm commands.
4545
46+
> [!TIP]
47+
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
48+
4649
```console
4750
# Create a namespace for your ingress resources
4851
kubectl create namespace ingress-basic
@@ -402,4 +405,5 @@ You can also:
402405
[aks-ingress-own-tls]: ingress-own-tls.md
403406
[aks-quickstart-cli]: kubernetes-walkthrough.md
404407
[aks-quickstart-portal]: kubernetes-walkthrough-portal.md
405-
[install-azure-cli]: /cli/azure/install-azure-cli
408+
[client-source-ip]: concepts-network.md#ingress-controllers
409+
[install-azure-cli]: /cli/azure/install-azure-cli

articles/app-service/containers/configure-custom-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This guide provides key concepts and instructions for containerization of Linux
2424

2525
## Configure port number
2626

27-
The web server in your custom image may use a port other than 80. You tell Azure about the port that your custom uses by using the `WEBSITES_PORT` app setting. The GitHub page for the [Python sample in this tutorial](https://github.com/Azure-Samples/docker-django-webapp-linux) shows that you need to set `WEBSITES_PORT` to _8000_. You can set it by running [`az webapp config appsettings set`](/cli/azure/webapp/config/appsettings?view=azure-cli-latest#az-webapp-config-appsettings-set) command in the Cloud Shell. For example:
27+
The web server in your custom image may use a port other than 80. You tell Azure about the port that your custom container uses by using the `WEBSITES_PORT` app setting. The GitHub page for the [Python sample in this tutorial](https://github.com/Azure-Samples/docker-django-webapp-linux) shows that you need to set `WEBSITES_PORT` to _8000_. You can set it by running [`az webapp config appsettings set`](/cli/azure/webapp/config/appsettings?view=azure-cli-latest#az-webapp-config-appsettings-set) command in the Cloud Shell. For example:
2828

2929
```azurecli-interactive
3030
az webapp config appsettings set --resource-group <resource-group-name> --name <app-name> --settings WEBSITES_PORT=8000

articles/azure-monitor/app/ip-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You need to open some outgoing ports in your server's firewall to allow the Appl
3131

3232
| Purpose | URL | IP | Ports |
3333
| --- | --- | --- | --- |
34-
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54<br/>52.175.198.74<br/>51.140.6.23<br/>40.71.12.231<br/>13.69.65.22<br/>13.78.108.165<br/>13.70.72.233<br/>20.44.8.7<br/>13.86.218.248<br/>40.79.138.41<br/>52.231.18.241<br/>13.75.38.7<br/>102.133.162.117<br/>40.73.171.20 | 443 |
34+
| Telemetry |dc.services.visualstudio.com<br/>dc.applicationinsights.microsoft.com |40.114.241.141<br/>104.45.136.42<br/>40.84.189.107<br/>168.63.242.221<br/>52.167.221.184<br/>52.169.64.244<br/>40.85.218.175<br/>104.211.92.54<br/>52.175.198.74<br/>51.140.6.23<br/>40.71.12.231<br/>13.69.65.22<br/>13.78.108.165<br/>13.70.72.233<br/>20.44.8.7<br/>13.86.218.248<br/>40.79.138.41<br/>52.231.18.241<br/>13.75.38.7<br/>102.133.162.117<br/>40.73.171.20<br/>102.133.155.50 | 443 |
3535
| Live Metrics Stream |rt.services.visualstudio.com<br/>rt.applicationinsights.microsoft.com |23.96.28.38<br/>13.92.40.198 |443 |
3636

3737
## Status Monitor

articles/azure-resource-manager/deployment-manager-overview.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
---
22
title: Safe deployment practices across regions - Azure Deployment Manager
33
description: Describes how to deploy a service over many regions with Azure Deployment Manager. It shows safe deployment practices to verify the stability of your deployment before rolling out to all regions.
4-
services: azure-resource-manager
5-
documentationcenter: na
64
author: tfitzmac
75

86
ms.service: azure-resource-manager
9-
ms.devlang: na
107
ms.topic: conceptual
11-
ms.tgt_pltfrm: na
12-
ms.workload: na
13-
ms.date: 05/13/2019
8+
ms.date: 05/31/2019
149
ms.author: tomfitz
1510
ms.custom: seodec18
1611
---
@@ -20,7 +15,7 @@ To deploy your service across many regions and make sure it's running as expecte
2015

2116
Deployment Manager is a feature of Resource Manager. It expands your capabilities during deployment. Use Deployment Manager when you have a complex service that needs to be deployed to several regions. By staging the rollout of your service, you can find potential problems before it has been deployed to all regions. If you don't need the extra precautions of a staged rollout, use the standard [deployment options](resource-group-template-deploy-portal.md) for Resource Manager. Deployment Manager seamlessly integrates with all existing third-party tools that support Resource Manager deployments, such as continuous integration and continuous delivery (CI/CD) offerings.
2217

23-
Azure Deployment Manager is in private preview. To use Azure Deployment Manager, complete the [sign-up form](https://aka.ms/admsignup). Help up improve the feature by providing [feedback](https://aka.ms/admfeedback).
18+
Azure Deployment Manager is in preview. Help us improve the feature by providing [feedback](https://aka.ms/admfeedback).
2419

2520
To use Deployment Manager, you need to create four files:
2621

0 commit comments

Comments
 (0)