Skip to content

Commit d520642

Browse files
committed
Resolving blocking issues
1 parent 774d61b commit d520642

9 files changed

+29
-29
lines changed

articles/aks/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,11 @@
327327
- name: AKS-managed Azure AD
328328
items:
329329
- name: Enable AKS-managed Azure AD integration
330-
href: managed-aad.md
330+
href: managed-azure-ad.md
331331
- name: Manage local accounts
332-
href: manage-local-accounts-managed-aad.md
332+
href: manage-local-accounts-managed-azure-ad.md
333333
- name: Cluster access control
334-
href: access-control-managed-aad.md
334+
href: access-control-managed-azure-ad.md
335335
- name: Azure AD integration (legacy)
336336
href: azure-ad-integration-cli.md
337337
- name: Enable GMSA integration

articles/aks/access-control-managed-aad.md renamed to articles/aks/access-control-managed-azure-ad.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ ms.custom: devx-track-azurecli
88

99
# Cluster access control with AKS-managed Azure Active Directory integration
1010

11-
When you integrate Azure AD with your AKS cluster, you can use [Conditional Access][aad-conditional-access] or Privileged Identity Management (PIM) for just-in-time requests to control access to your cluster. This articles shows you how to enable Conditional Access and PIM on your AKS clusters.
11+
When you integrate Azure AD with your AKS cluster, you can use [Conditional Access][aad-conditional-access] or Privileged Identity Management (PIM) for just-in-time requests to control access to your cluster. This article shows you how to enable Conditional Access and PIM on your AKS clusters.
1212

1313
> [!NOTE]
1414
> Azure AD Conditional Access and Privileged Identity Management are Azure AD Premium capabilities requiring a Premium P2 SKU. For more on Azure AD SKUs, see the [pricing guide][aad-pricing].
1515
1616
## Before you begin
1717

18-
* See [AKS-managed Azure Active Directory integration](./managed-aad.md) for an overview and setup instructions.
18+
* See [AKS-managed Azure Active Directory integration](./managed-azure-ad.md) for an overview and setup instructions.
1919

2020
## Use Conditional Access with Azure AD and AKS
2121

2222
1. In the Azure portal, go to the **Azure Active Directory** page and select **Enterprise applications**.
2323
2. Select **Conditional Access** > **Policies** > **New policy**.
2424

25-
:::image type="content" source="./media/managed-aad/conditional-access-new-policy.png" alt-text="Adding a Conditional Access policy":::
25+
:::image type="content" source="./media/managed-aad/conditional-access-new-policy.png" alt-text="Screenshot of adding a Conditional Access policy." lightbox="./media/managed-aad/conditional-access-new-policy.png":::
2626

2727
3. Enter a name for the policy, such as *aks-policy*.
2828

2929
4. Under **Assignments**, select **Users and groups**. Choose the users and groups you want to apply the policy to. In this example, choose the same Azure AD group that has administrator access to your cluster.
3030

31-
:::image type="content" source="./media/managed-aad/conditional-access-users-groups.png" alt-text="Selecting users or groups to apply the Conditional Access policy":::
31+
:::image type="content" source="./media/managed-aad/conditional-access-users-groups.png" alt-text="Screenshot of selecting users or groups to apply the Conditional Access policy." lightbox=source="./media/managed-aad/conditional-access-users-groups.png":::
3232

3333
5. Under **Cloud apps or actions** > **Include**, select **Select apps**. Search for **Azure Kubernetes Service** and select **Azure Kubernetes Service AAD Server**.
3434

35-
:::image type="content" source="./media/managed-aad/conditional-access-apps.png" alt-text="Selecting Azure Kubernetes Service AD Server for applying the Conditional Access policy":::
35+
:::image type="content" source="./media/managed-aad/conditional-access-apps.png" alt-text="Screenshot of selecting Azure Kubernetes Service AD Server for applying the Conditional Access policy." lightbox="./media/managed-aad/conditional-access-apps.png":::
3636

3737
6. Under **Access controls** > **Grant**, select **Grant access**, **Require device to be marked as compliant**, and **Require all the selected controls**.
3838

39-
:::image type="content" source="./media/managed-aad/conditional-access-grant-compliant.png" alt-text="Selecting to only allow compliant devices for the Conditional Access policy":::
39+
:::image type="content" source="./media/managed-aad/conditional-access-grant-compliant.png" alt-text="Screenshot of selecting to only allow compliant devices for the Conditional Access policy." lightbox="./media/managed-aad/conditional-access-grant-compliant.png" :::
4040

4141
7. Confirm your settings, set **Enable policy** to **On**, and then select **Create**.
4242

43-
:::image type="content" source="./media/managed-aad/conditional-access-enable-policy.png" alt-text="Enabling the Conditional Access policy":::
43+
:::image type="content" source="./media/managed-aad/conditional-access-enable-policy.png" alt-text="Screenshot of enabling the Conditional Access policy." lightbox="./media/managed-aad/conditional-access-enable-policy.png":::
4444

4545
### Verify your Conditional Access policy has been successfully listed
4646

@@ -62,27 +62,27 @@ When you integrate Azure AD with your AKS cluster, you can use [Conditional Acce
6262
6363
5. Under the **Conditional Access** column you should see a status of *Success*. Select the event and then select the **Conditional Access** tab. Your Conditional Access policy will be listed.
6464
65-
:::image type="content" source="./media/managed-aad/conditional-access-sign-in-activity.png" alt-text="Screenshot that shows failed sign-in entry due to Conditional Access policy.":::
65+
:::image type="content" source="./media/managed-aad/conditional-access-sign-in-activity.png" alt-text="Screenshot that shows failed sign-in entry due to Conditional Access policy." lightbox="./media/managed-aad/conditional-access-sign-in-activity.png":::
6666
6767
## Configure just-in-time cluster access with Azure AD and AKS
6868
6969
1. In the Azure portal, go to **Azure Active Directory** and select **Properties**.
7070
7171
2. Note the value listed under **Tenant ID**. It will be referenced in a later step as `<tenant-id>`.
7272
73-
:::image type="content" source="./media/managed-aad/jit-get-tenant-id.png" alt-text="In a web browser, the Azure portal screen for Azure Active Directory is shown with the tenant's ID highlighted.":::
73+
:::image type="content" source="./media/managed-aad/jit-get-tenant-id.png" alt-text="Screenshot of the Azure portal screen for Azure Active Directory with the tenant's ID highlighted." lightbox="./media/managed-aad/jit-get-tenant-id.png":::
7474
7575
3. Select **Groups** > **New group**.
7676
77-
:::image type="content" source="./media/managed-aad/jit-create-new-group.png" alt-text="Shows the Azure portal Active Directory groups screen with the 'New Group' option highlighted.":::
77+
:::image type="content" source="./media/managed-aad/jit-create-new-group.png" alt-text="Screenshot of the Azure portal Active Directory groups screen with the New Group option highlighted." lightbox="./media/managed-aad/jit-create-new-group.png":::
7878
7979
4. Verify the group type **Security** is selected and specify a group name, such as *myJITGroup*. Under the option **Azure AD roles can be assigned to this group (Preview)**, select **Yes** and then select **Create**.
8080
81-
:::image type="content" source="./media/managed-aad/jit-new-group-created.png" alt-text="Shows the Azure portal's new group creation screen.":::
81+
:::image type="content" source="./media/managed-aad/jit-new-group-created.png" alt-text="Screenshot of the new group creation screen in the Azure portal." lightbox="./media/managed-aad/jit-new-group-created.png":::
8282
8383
5. On the **Groups** page, select the group you just created and note the Object ID. It will be referenced in a later step as `<object-id>`.
8484
85-
:::image type="content" source="./media/managed-aad/jit-get-object-id.png" alt-text="Shows the Azure portal screen for the just-created group, highlighting the Object Id":::
85+
:::image type="content" source="./media/managed-aad/jit-get-object-id.png" alt-text="Screenshot of the Azure portal screen for the just-created group with the Object ID highlighted." lightbox="./media/managed-aad/jit-get-object-id.png":::
8686
8787
6. Create the AKS cluster with AKS-managed Azure AD integration using the [`az aks create`][az-aks-create] command with the `--aad-admin-group-objects-ids` and `--aad-tenant-id parameters` and include the values noted in the steps earlier.
8888
@@ -92,19 +92,19 @@ When you integrate Azure AD with your AKS cluster, you can use [Conditional Acce
9292
9393
7. In the Azure portal, select **Activity** > **Privileged Access (Preview)** > **Enable Privileged Access**.
9494
95-
:::image type="content" source="./media/managed-aad/jit-enabling-priv-access.png" alt-text="The Azure portal's Privileged access (Preview) page is shown, with 'Enable privileged access' highlighted":::
95+
:::image type="content" source="./media/managed-aad/jit-enabling-priv-access.png" alt-text="Screenshot of the Privileged access (Preview) page in the Azure portal with Enable privileged access highlighted." lightbox="./media/managed-aad/jit-enabling-priv-access.png":::
9696
9797
8. To grant access, select **Add assignments**.
9898
99-
:::image type="content" source="./media/managed-aad/jit-add-active-assignment.png" alt-text="The Azure portal's Privileged access (Preview) screen after enabling is shown. The option to 'Add assignments' is highlighted.":::
99+
:::image type="content" source="./media/managed-aad/jit-add-active-assignment.png" alt-text="Screenshot of the Privileged access (Preview) screen in the Azure portal after enabling. The option to Add assignments is highlighted." lightbox="./media/managed-aad/jit-add-active-assignment.png":::
100100
101-
9. From the **Select role** drop-down list, select the users and groups you want to grant cluster access. These assignments can be modified at any time by a group administrator. Then select **Next**.
101+
9. From the **Select role** drop-down list, select the users and groups you want to grant cluster access. These assignments can be modified at any time by a group administrator. Then select **Next**.
102102
103-
:::image type="content" source="./media/managed-aad/jit-adding-assignment.png" alt-text="The Azure portal's Add assignments Membership screen is shown, with a sample user selected to be added as a member. The option 'Next' is highlighted.":::
103+
:::image type="content" source="./media/managed-aad/jit-adding-assignment.png" alt-text="Screenshot of the Add assignments Membership screen in the Azure portal with a sample user selected to be added as a member. The Next option is highlighted." lightbox="./media/managed-aad/jit-adding-assignment.png":::
104104
105105
10. Under **Assignment type**, select **Active** and then specify the desired duration. Provide a justification and then select **Assign**.
106106
107-
:::image type="content" source="./media/managed-aad/jit-set-active-assignment-details.png" alt-text="The Azure portal's Add assignments Setting screen is shown. An assignment type of 'Active' is selected and a sample justification has been given. The option 'Assign' is highlighted.":::
107+
:::image type="content" source="./media/managed-aad/jit-set-active-assignment-details.png" alt-text="Screenshot of the Add assignments Setting screen in the Azure portal. An assignment type of Active is selected and a sample justification has been given. The Assign option is highlighted." lightbox="./media/managed-aad/jit-set-active-assignment-details.png":::
108108
109109
For more information about assignment types, see [Assign eligibility for a privileged access group (preview) in Privileged Identity Management][aad-assignments].
110110

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,5 +282,5 @@ For best practices on identity and resource control, see [Best practices for aut
282282
[rbac-authorization]: concepts-identity.md#kubernetes-rbac
283283
[operator-best-practices-identity]: operator-best-practices-identity.md
284284
[azure-ad-rbac]: azure-ad-rbac.md
285-
[managed-aad]: managed-aad.md
286-
[managed-aad-migrate]: managed-aad.md#upgrade-a-legacy-azure-ad-cluster-to-aks-managed-azure-ad-integration
285+
[managed-aad]: managed-azure-ad.md
286+
[managed-aad-migrate]: managed-azure-ad.md#upgrade-a-legacy-azure-ad-cluster-to-aks-managed-azure-ad-integration

articles/aks/azure-ad-rbac.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ az ad group delete --group opssre
461461
<!-- LINKS - internal -->
462462
[az-aks-get-credentials]: /cli/azure/aks#az_aks_get_credentials
463463
[install-azure-cli]: /cli/azure/install-azure-cli
464-
[azure-ad-aks-cli]: managed-aad.md
464+
[azure-ad-aks-cli]: managed-azure-ad.md
465465
[az-aks-show]: /cli/azure/aks#az_aks_show
466466
[az-ad-group-create]: /cli/azure/ad/group#az_ad_group_create
467467
[az-role-assignment-create]: /cli/azure/role/assignment#az_role_assignment_create
@@ -471,4 +471,4 @@ az ad group delete --group opssre
471471
[rbac-authorization]: concepts-identity.md#kubernetes-rbac
472472
[operator-best-practices-identity]: operator-best-practices-identity.md
473473
[terraform-on-azure]: /azure/developer/terraform/overview
474-
[enable-azure-ad-integration-existing-cluster]: managed-aad.md#use-an-existing-cluster
474+
[enable-azure-ad-integration-existing-cluster]: managed-azure-ad.md#use-an-existing-cluster

articles/aks/kubernetes-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ This article showed you how to access Kubernetes resources from the Azure portal
119119
[concepts-identity]: concepts-identity.md
120120
[aks-quickstart-portal]: ./learn/quick-kubernetes-deploy-portal.md
121121
[deployments]: concepts-clusters-workloads.md#deployments-and-yaml-manifests
122-
[aks-managed-aad]: managed-aad.md
123-
[cli-aad-upgrade]: managed-aad.md#upgrade-a-legacy-azure-ad-cluster-to-aks-managed-azure-ad-integration
122+
[aks-managed-aad]: managed-azure-ad.md
123+
[cli-aad-upgrade]: managed-azure-ad.md#upgrade-a-legacy-azure-ad-cluster-to-aks-managed-azure-ad-integration
124124
[enable-monitor]: ../azure-monitor/containers/container-insights-enable-existing-clusters.md

articles/aks/manage-local-accounts-managed-aad.md renamed to articles/aks/manage-local-accounts-managed-azure-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ When you deploy an AKS cluster, local accounts are enabled by default. Even when
1212

1313
## Before you begin
1414

15-
* See [AKS-managed Azure Active Directory integration](./managed-aad.md) for an overview and setup instructions.
15+
* See [AKS-managed Azure Active Directory integration](./managed-azure-ad.md) for an overview and setup instructions.
1616

1717
## Disable local accounts
1818

File renamed without changes.

articles/aks/trusted-access-feature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This article shows you how to enable secure access from your Azure services to y
2828

2929
## Trusted Access feature overview
3030

31-
Trusted Access enables you to give explicit consent to your system-assigned MSI of allowed resources to access your AKS clusters using an Azure resource *RoleBinding*. Your Azure resources access AKS clusters through the AKS regional gateway via system-assigned managed identity authentication with the appropriate Kubernetes permissions via an Azure resource *Role*. The Trusted Access feature allows you to access AKS clusters with different configurations, including but not limited to [private clusters](private-clusters.md), [clusters with local accounts disabled](manage-local-accounts-managed-aad.md#disable-local-accounts), [Azure AD clusters](azure-ad-integration-cli.md), and [authorized IP range clusters](api-server-authorized-ip-ranges.md).
31+
Trusted Access enables you to give explicit consent to your system-assigned MSI of allowed resources to access your AKS clusters using an Azure resource *RoleBinding*. Your Azure resources access AKS clusters through the AKS regional gateway via system-assigned managed identity authentication with the appropriate Kubernetes permissions via an Azure resource *Role*. The Trusted Access feature allows you to access AKS clusters with different configurations, including but not limited to [private clusters](private-clusters.md), [clusters with local accounts disabled](manage-local-accounts-managed-azure-ad.md#disable-local-accounts), [Azure AD clusters](azure-ad-integration-cli.md), and [authorized IP range clusters](api-server-authorized-ip-ranges.md).
3232

3333
## Prerequisites
3434

articles/machine-learning/how-to-deploy-kubernetes-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In this article, you can learn:
4141

4242
- [Using a service principal with AKS](../aks/kubernetes-service-principal.md) is **not supported** by Azure Machine Learning. The AKS cluster must use a **managed identity** instead. Both **system-assigned managed identity** and **user-assigned managed identity** are supported. For more information, see [Use a managed identity in Azure Kubernetes Service](../aks/use-managed-identity.md).
4343
- When your AKS cluster used service principal is converted to use Managed Identity, before installing the extension, all node pools need to be deleted and recreated, rather than updated directly.
44-
- [Disabling local accounts](../aks/manage-local-accounts-managed-aad.md#disable-local-accounts) for AKS is **not supported** by Azure Machine Learning. When the AKS Cluster is deployed, local accounts are enabled by default.
44+
- [Disabling local accounts](../aks/manage-local-accounts-managed-azure-ad.md#disable-local-accounts) for AKS is **not supported** by Azure Machine Learning. When the AKS Cluster is deployed, local accounts are enabled by default.
4545
- If your AKS cluster has an [Authorized IP range enabled to access the API server](../aks/api-server-authorized-ip-ranges.md), enable the Azure Machine Learning control plane IP ranges for the AKS cluster. The Azure Machine Learning control plane is deployed across paired regions. Without access to the API server, the machine learning pods can't be deployed. Use the [IP ranges](https://www.microsoft.com/download/confirmation.aspx?id=56519) for both the [paired regions](../availability-zones/cross-region-replication-azure.md) when enabling the IP ranges in an AKS cluster.
4646
- Azure Machine Learning does not support attaching an AKS cluster cross subscription. If you have an AKS cluster in a different subscription, you must first [connect it to Azure-Arc](../azure-arc/kubernetes/quickstart-connect-cluster.md) and specify in the same subscription as your Azure Machine Learning workspace.
4747
- Azure Machine Learning does not guarantee support for all preview stage features in AKS. For example, [Azure AD pod identity](../aks/use-azure-ad-pod-identity.md) is not supported.

0 commit comments

Comments
 (0)