Skip to content

Commit 46bb5da

Browse files
authored
Merge pull request #184999 from MicrosoftDocs/master
1/13 AM Publish
2 parents 523bdc6 + c16a2aa commit 46bb5da

File tree

62 files changed

+312
-107
lines changed

Some content is hidden

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

62 files changed

+312
-107
lines changed

articles/active-directory-b2c/identity-provider-microsoft-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 09/16/2021
12+
ms.date: 01/13/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C

articles/active-directory-b2c/manage-user-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 03/09/2021
11+
ms.date: 01/13/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---

articles/active-directory-b2c/quickstart-native-app-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: quickstart
1111
ms.custom: mvc, mode-other
12-
ms.date: 08/16/2021
12+
ms.date: 01/13/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---

articles/active-directory-b2c/quickstart-single-page-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: quickstart
11-
ms.date: 04/04/2020
11+
ms.date: 01/13/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: mode-other

articles/active-directory/develop/active-directory-how-applications-are-added.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,14 @@ Allowing users to register and consent to applications might initially sound con
133133

134134
If you still want to prevent users in your directory from registering applications and from signing in to applications without administrator approval, there are two settings that you can change to turn off those capabilities:
135135

136-
* To prevent users from consenting to applications on their own behalf:
137-
1. In the Azure portal, go to the [User settings](https://portal.azure.com/#blade/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/UserSettings/menuId/) section under Enterprise applications.
138-
2. Change **Users can consent to apps accessing company data on their behalf** to **No**.
139-
140-
> [!NOTE]
141-
> If you decide to turn off user consent, an admin will be required to consent to any new application a user needs to use.
136+
* To change the user consent settings in your organization, see [Configure how users consent to applications](../manage-apps/configure-user-consent.md).
142137

143138
* To prevent users from registering their own applications:
144139
1. In the Azure portal, go to the [User settings](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/UserSettings) section under Azure Active Directory
145140
2. Change **Users can register applications** to **No**.
146141

147142
> [!NOTE]
148-
> Microsoft itself uses the default configuration with users able to register applications and consent to applications on their own behalf.
143+
> Microsoft itself uses the default configuration allowing users to register applications and only allows user consent for a very limited set of permissions.
149144
150145
<!--Image references-->
151-
[apps_service_principals_directory]:../media/active-directory-how-applications-are-added/HowAppsAreAddedToAAD.jpg
146+
[apps_service_principals_directory]:../media/active-directory-how-applications-are-added/HowAppsAreAddedToAAD.jpg

articles/active-directory/manage-apps/configure-admin-consent-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To enable the admin consent workflow and choose reviewers:
4141
1. Select **Enterprise applications**.
4242
1. Under **Manage**, select **User settings**.
4343
Under **Admin consent requests**, select **Yes** for **Users can request admin consent to apps they are unable to consent to** .
44-
:::image type="content" source="media/configure-admin-consent-workflow/admin-consent-requests-settings.png" alt-text="Configure admin consent workflow settings":::
44+
:::image type="content" source="media/configure-admin-consent-workflow/enable-admin-consent-workflow.png" alt-text="Configure admin consent workflow settings":::
4545
1. Configure the following settings:
4646

4747
- **Select users to review admin consent requests** - Select reviewers for this workflow from a set of users that have the global administrator, cloud application administrator, or application administrator roles. You can also add groups and roles that can configure an admin consent workflow. You must designate at least one reviewer before the workflow can be enabled.

articles/active-directory/manage-apps/manage-app-consent-policies.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ title: Manage app consent policies
33
description: Learn how to manage built-in and custom app consent policies to control when consent can be granted.
44
titleSuffix: Azure AD
55
services: active-directory
6-
author: davidmu1
7-
manager: CelesteDG
6+
author: psignoret
87
ms.service: active-directory
98
ms.subservice: app-mgmt
109
ms.workload: identity
1110
ms.topic: how-to
1211
ms.date: 09/02/2021
13-
ms.author: davidmu
14-
ms.reviewer: arvindh, luleon, phsignor
12+
ms.author: phsignor
1513
ms.custom: contperf-fy21q2
1614

1715
#customer intent: As an admin, I want to manage app consent policies for enterprise applications in Azure AD
@@ -29,14 +27,7 @@ App consent policies where the ID begins with "microsoft-" are built-in policies
2927

3028
## Pre-requisites
3129

32-
1. Make sure you're using the [AzureADPreview](/powershell/module/azuread/?preserve-view=true&view=azureadps-2.0-preview) module. This step is important if you have installed both the [AzureAD](/powershell/module/azuread/) module and the [AzureADPreview](/powershell/module/azuread/?preserve-view=true&view=azureadps-2.0-preview) module).
33-
34-
```powershell
35-
Remove-Module AzureAD -ErrorAction SilentlyContinue
36-
Import-Module AzureADPreview
37-
```
38-
39-
1. Connect to Azure AD PowerShell.
30+
1. Connect to [Azure AD PowerShell](/powershell/module/azuread/).
4031

4132
```powershell
4233
Connect-AzureAD

articles/aks/csi-secrets-store-identity-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Azure Active Directory (Azure AD) pod-managed identities use AKS primitives to a
111111
1. To access your key vault, you can use the user-assigned managed identity that you created when you [enabled a managed identity on your AKS cluster][use-managed-identity]:
112112
113113
```azurecli-interactive
114-
az aks show -g <resource-group> -n <cluster-name> --query identityProfile.kubeletidentity.clientId -o tsv
114+
az aks show -g <resource-group> -n <cluster-name> --query addonProfiles.azureKeyvaultSecretsProvider.identity.clientId -o tsv
115115
```
116116
117117
Alternatively, you can create a new managed identity and assign it to your virtual machine (VM) scale set or to each VM instance in your availability set:

articles/aks/kubernetes-walkthrough.md

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@ To learn more about creating a Windows Server node pool, see [Create an AKS clus
2727

2828
- This article requires version 2.0.64 or greater of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
2929
- The identity you are using to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](concepts-identity.md).
30+
- Verify *Microsoft.OperationsManagement* and *Microsoft.OperationalInsights* are registered on your subscription. To check the registration status:
31+
32+
```azurecli
33+
az provider show -n Microsoft.OperationsManagement -o table
34+
az provider show -n Microsoft.OperationalInsights -o table
35+
```
36+
37+
If they are not registered, register *Microsoft.OperationsManagement* and *Microsoft.OperationalInsights* using:
38+
39+
```azurecli
40+
az provider register --namespace Microsoft.OperationsManagement
41+
az provider register --namespace Microsoft.OperationalInsights
42+
```
3043
3144
> [!NOTE]
3245
> Run the commands as administrator if you plan to run the commands in this quickstart locally instead of in Azure Cloud Shell.
@@ -59,27 +72,11 @@ Output for successfully created resource group:
5972
},
6073
"tags": null
6174
}
62-
```
63-
64-
## Enable cluster monitoring
65-
66-
Verify *Microsoft.OperationsManagement* and *Microsoft.OperationalInsights* are registered on your subscription. To check the registration status:
67-
68-
```azurecli
69-
az provider show -n Microsoft.OperationsManagement -o table
70-
az provider show -n Microsoft.OperationalInsights -o table
71-
```
72-
73-
If they are not registered, register *Microsoft.OperationsManagement* and *Microsoft.OperationalInsights* using:
74-
75-
```azurecli
76-
az provider register --namespace Microsoft.OperationsManagement
77-
az provider register --namespace Microsoft.OperationalInsights
78-
```
75+
```
7976

8077
## Create AKS cluster
8178

82-
Create an AKS cluster using the [az aks create][az-aks-create] command with the *--enable-addons monitoring* parameter to enable [Azure Monitor for containers][azure-monitor-containers]. The following example creates a cluster named *myAKSCluster* with one node:
79+
Create an AKS cluster using the [az aks create][az-aks-create] command with the *--enable-addons monitoring* parameter to enable [Azure Monitor container insights][azure-monitor-containers]. The following example creates a cluster named *myAKSCluster* with one node:
8380

8481
```azurecli-interactive
8582
az aks create --resource-group myResourceGroup --name myAKSCluster --node-count 1 --enable-addons monitoring --generate-ssh-keys
@@ -268,7 +265,7 @@ To see the Azure Vote app in action, open a web browser to the external IP addre
268265

269266
![Voting app deployed in Azure Kubernetes Service](./media/container-service-kubernetes-walkthrough/voting-app-deployed-in-azure-kubernetes-service.png)
270267

271-
View the cluster nodes' and pods' health metrics captured by [Azure Monitor for containers][azure-monitor-containers] in the Azure portal.
268+
View the cluster nodes' and pods' health metrics captured by [Azure Monitor container insights][azure-monitor-containers] in the Azure portal.
272269

273270
## Delete the cluster
274271

@@ -279,9 +276,9 @@ az group delete --name myResourceGroup --yes --no-wait
279276
```
280277

281278
> [!NOTE]
282-
> When you delete the cluster, the Azure Active Directory service principal used by the AKS cluster is not removed. For steps on how to remove the service principal, see [AKS service principal considerations and deletion][sp-delete].
279+
> If the AKS cluster was created with system-assigned managed identity (default identity option used in this quickstart), the identity is managed by the platform and does not require removal.
283280
>
284-
> If you used a managed identity, the identity is managed by the platform and does not require removal.
281+
> If the AKS cluster was created with service principal as the identity option instead, then when you delete the cluster, the service principal used by the AKS cluster is not removed. For steps on how to remove the service principal, see [AKS service principal considerations and deletion][sp-delete].
285282
286283
## Get the code
287284

articles/aks/quickstart-helm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ cd azure-voting-app-redis/azure-vote/
9292

9393
## Build and push the sample application to the ACR
9494

95-
Using the preceding Dockerfile, run the [az acr build][az-acr-build] command to build and push an image to the registry. The `.` at the end of the command sets the location of the Dockerfile (in this case, the current directory).
95+
Using the preceding Dockerfile, run the [az acr build][az-acr-build] command to build and push an image to the registry. The `.` at the end of the command provides the location of the source code directory path (in this case, the current directory). The `--file` parameter takes in the path of the Dockerfile relative to this source code directory path.
9696

9797
```azurecli
9898
az acr build --image azure-vote-front:v1 --registry MyHelmACR --file Dockerfile .
@@ -214,9 +214,9 @@ az group delete --name MyResourceGroup --yes --no-wait
214214
```
215215

216216
> [!NOTE]
217-
> When you delete the cluster, the Azure Active Directory service principal used by the AKS cluster is not removed. For steps on how to remove the service principal, see [AKS service principal considerations and deletion][sp-delete].
217+
> If the AKS cluster was created with system-assigned managed identity (default identity option used in this quickstart), the identity is managed by the platform and does not require removal.
218218
>
219-
> If you used a managed identity, the identity is managed by the platform and does not require removal.
219+
> If the AKS cluster was created with service principal as the identity option instead, then when you delete the cluster, the service principal used by the AKS cluster is not removed. For steps on how to remove the service principal, see [AKS service principal considerations and deletion][sp-delete].
220220

221221
## Next steps
222222

0 commit comments

Comments
 (0)