Skip to content

Commit 36b2a56

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-master
2 parents b55ced2 + 1f952fc commit 36b2a56

File tree

88 files changed

+2065
-1232
lines changed

Some content is hidden

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

88 files changed

+2065
-1232
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
3636
"redirect_document_id": false
3737
},
38-
3938
{
4039
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
4140
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -20691,6 +20690,11 @@
2069120690
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2069220691
"redirect_document_id": false
2069320692
},
20693+
{
20694+
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20695+
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20696+
"redirect_document_id": false
20697+
},
2069420698
{
2069520699
"source_path": "articles/multi-factor-authentication/multi-factor-authentication-app-faq.md",
2069620700
"redirect_url": "./end-user/microsoft-authenticator-app-faq",
4.45 KB
Loading
2.85 KB
Loading

articles/active-directory/develop/registration-config-how-to.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ You can find the authentication endpoints for your application in the [Azure por
2929

3030
- Use the endpoint specific to the authentication protocol you are using, in conjunction with the application ID to craft the authentication request specific to your application.
3131

32+
**National clouds** (for example Azure AD China, Germany, and US Government) have their own app registration portal and Azure AD authentication endpoints. Learn more in the [National clouds overview](authentication-national-cloud.md).
33+
3234
## Next steps
3335
[Azure Active Directory developer's guide](https://docs.microsoft.com/azure/active-directory/develop/active-directory-developers-guide)

articles/active-directory/users-groups-roles/roles-delegate-by-task.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: users-groups-roles
1111
ms.topic: article
12-
ms.date: 03/03/2020
12+
ms.date: 05/04/2020
1313
ms.author: curtand
1414
ms.reviewer: vincesm
1515
ms.custom: it-pro
@@ -73,9 +73,9 @@ Configure company properties | Global Administrator |
7373

7474
Task | Least privileged role | Additional roles
7575
---- | --------------------- | ----------------
76-
Passthrough authentication | Global Administrator |
77-
Read all configuration | Global reader | Global Administrator |
78-
Seamless single sign-on | Global Administrator |
76+
Passthrough authentication | Hybrid Identity Administrator |
77+
Read all configuration | Global reader | Hybrid Identity Administrator |
78+
Seamless single sign-on | Hybrid Identity Administrator |
7979

8080
## Connect Health
8181

articles/aks/azure-ad-integration-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ serverApplicationId=$(az ad app create \
5353
--identifier-uris "https://${aksname}Server" \
5454
--query appId -o tsv)
5555
56-
# Update the application group memebership claims
56+
# Update the application group membership claims
5757
az ad app update --id $serverApplicationId --set groupMembershipClaims=All
5858
```
5959

articles/aks/developer-best-practices-pod-security.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
title: Pod security best practices
3-
titleSuffix: Azure Kubernetes Service
2+
title: Developer best practices - Pod security in Azure Kubernetes Services (AKS)
43
description: Learn the developer best practices for how to secure pods in Azure Kubernetes Service (AKS)
54
services: container-service
65
author: zr-msft
@@ -70,7 +69,7 @@ To limit the risk of credentials being exposed in your application code, avoid t
7069
The following [associated AKS open source projects][aks-associated-projects] let you automatically authenticate pods or request credentials and keys from a digital vault:
7170
7271
* Managed identities for Azure resources, and
73-
* Azure Key Vault FlexVol driver
72+
* [Azure Key Vault Provider for Secrets Store CSI Driver](https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage)
7473
7574
Associated AKS open source projects are not supported by Azure technical support. They are provided to gather feedback and bugs from our community. These projects are not recommended for production use.
7675
@@ -84,28 +83,28 @@ With a managed identity, your application code doesn't need to include credentia
8483
8584
For more information about pod identities, see [Configure an AKS cluster to use pod managed identities and with your applications][aad-pod-identity]
8685
87-
### Use Azure Key Vault with FlexVol
86+
### Use Azure Key Vault with Secrets Store CSI Driver
8887
89-
Managed pod identities work great to authenticate against supporting Azure services. For your own services or applications without managed identities for Azure resources, you still authenticate using credentials or keys. A digital vault can be used to store these credentials.
88+
Using the pod identity project enables authentication against supporting Azure services. For your own services or applications without managed identities for Azure resources, you can still authenticate using credentials or keys. A digital vault can be used to store these secret contents.
9089
91-
When applications need a credential, they communicate with the digital vault, retrieve the latest credentials, and then connect to the required service. Azure Key Vault can be this digital vault. The simplified workflow for retrieving a credential from Azure Key Vault using pod managed identities is shown in the following diagram:
90+
When applications need a credential, they communicate with the digital vault, retrieve the latest secret contents, and then connect to the required service. Azure Key Vault can be this digital vault. The simplified workflow for retrieving a credential from Azure Key Vault using pod managed identities is shown in the following diagram:
9291
93-
![Simplified workflow for retrieving a credential from Key Vault using a pod managed identity](media/developer-best-practices-pod-security/basic-key-vault-flexvol.png)
92+
![Simplified workflow for retrieving a credential from Key Vault using a pod managed identity](media/developer-best-practices-pod-security/basic-key-vault.png)
9493
95-
With Key Vault, you store and regularly rotate secrets such as credentials, storage account keys, or certificates. You can integrate Azure Key Vault with an AKS cluster using a FlexVolume. The FlexVolume driver lets the AKS cluster natively retrieve credentials from Key Vault and securely provide them only to the requesting pod. Work with your cluster operator to deploy the Key Vault FlexVol driver onto the AKS nodes. You can use a pod managed identity to request access to Key Vault and retrieve the credentials you need through the FlexVolume driver.
94+
With Key Vault, you store and regularly rotate secrets such as credentials, storage account keys, or certificates. You can integrate Azure Key Vault with an AKS cluster using the [Azure Key Vault provider for the Secrets Store CSI Driver](https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage). The Secrets Store CSI driver enables the AKS cluster to natively retrieve secret contents from Key Vault and securely provide them only to the requesting pod. Work with your cluster operator to deploy the Secrets Store CSI Driver onto AKS worker nodes. You can use a pod managed identity to request access to Key Vault and retrieve the secret contents needed through the Secrets Store CSI Driver.
9695
97-
Azure Key Vault with FlexVol is intended for use with applications and services running on Linux pods and nodes.
96+
Azure Key Vault with Secrets Store CSI Driver can be used for Linux nodes and pods which require a Kubernetes version of 1.16 or greater. For Windows nodes and pods a Kubernetes version of 1.18 or greater is required.
9897
9998
## Next steps
10099
101100
This article focused on how to secure your pods. To implement some of these areas, see the following articles:
102101
103102
* [Use managed identities for Azure resources with AKS][aad-pod-identity]
104-
* [Integrate Azure Key Vault with AKS][aks-keyvault-flexvol]
103+
* [Integrate Azure Key Vault with AKS][aks-keyvault-csi-driver]
105104
106105
<!-- EXTERNAL LINKS -->
107106
[aad-pod-identity]: https://github.com/Azure/aad-pod-identity#demo
108-
[aks-keyvault-flexvol]: https://github.com/Azure/kubernetes-keyvault-flexvol
107+
[aks-keyvault-csi-driver]: https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage
109108
[linux-capabilities]: http://man7.org/linux/man-pages/man7/capabilities.7.html
110109
[selinux-labels]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.12/#selinuxoptions-v1-core
111110
[aks-associated-projects]: https://github.com/Azure/AKS/blob/master/previews.md#associated-projects
@@ -114,4 +113,4 @@ This article focused on how to secure your pods. To implement some of these area
114113
[best-practices-cluster-security]: operator-best-practices-cluster-security.md
115114
[best-practices-container-image-management]: operator-best-practices-container-image-management.md
116115
[aks-pod-identities]: operator-best-practices-identity.md#use-pod-identities
117-
[apparmor-seccomp]: operator-best-practices-cluster-security.md#secure-container-access-to-resources
116+
[apparmor-seccomp]: operator-best-practices-cluster-security.md#secure-container-access-to-resources

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Every client application that calls the API needs to be registered as an applica
7575
- In the **Name** section, enter a meaningful application name that will be displayed to users of the app, such as *client-app*.
7676
- In the **Supported account types** section, select **Accounts in any organizational directory (Any Azure AD directory - Multitenant)**.
7777

78-
1. In the **Redirect URI** section, select `Web` and enter the URL `https://contoso5.portal.azure-api.net/signin`.
78+
1. In the **Redirect URI** section, select `Web` and leave the URL field empty for now.
7979

8080
1. Select **Register** to create the application.
8181

@@ -145,9 +145,9 @@ In this example, the Developer Console is the client-app. The following steps de
145145

146146
1. Select **Create**.
147147

148-
1. Go back to your client-app and select **Authentication**.
148+
1. Go back to your client-app registration in Azure Active Directory and select **Authentication**.
149149

150-
1. Under **Redirect URIs**, select the type as **Web**, paste the **redirect_url** under **Redirect URI**, and then save.
150+
1. Under **Platform configurations** click on **Add a platform**, and select the type as **Web**, paste the **redirect_url** under **Redirect URI**, and then click on **Configure** button to save.
151151

152152
Now that you have configured an OAuth 2.0 authorization server, the Developer Console can obtain access tokens from Azure AD.
153153

articles/automation/automation-configure-windows-update.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Windows Update settings to work with Azure Update Management
33
description: This article describes the Windows Update settings that you configure to work with Azure Update Management.
44
services: automation
55
ms.subservice: update-management
6-
ms.date: 03/02/2020
6+
ms.date: 05/04/2020
77
ms.topic: conceptual
88
---
99
# Configure Windows Update settings for Update Management
@@ -17,6 +17,8 @@ Azure Update Management relies on [Windows Update client](https://docs.microsoft
1717

1818
Update Management respects many of the settings specified to control the Windows Update client. If you use settings to enable non-Windows updates, Update Management will also manage those updates. If you want to enable downloading of updates before an update deployment occurs, update deployment can be faster, more efficient, and less likely to exceed the maintenance window.
1919

20+
For additional recommendations on setting up WSUS in your Azure subscription and securely keep your Windows virtual machines up to date, review [Plan your deployment for updating Windows virtual machines in Azure using WSUS](https://docs.microsoft.com/azure/architecture/example-scenario/wsus/).
21+
2022
## Pre-download updates
2123

2224
To configure automatic downloading of updates but don't automatically install them, you can use Group Policy to set the [Configure Automatic Updates setting](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates##configure-automatic-updates) to **3**. This setting enables downloads of the required updates in the background, and notifies you that the updates are ready to install. In this way, Update Management remains in control of schedules, but updates can be downloaded outside the Update Management maintenance window. This behavior prevents **Maintenance window exceeded** errors in Update Management.

0 commit comments

Comments
 (0)