Adding Entra ID with group names

content/_index.md

@@ -160,13 +160,14 @@ description: "Step-by-step tutorials from Red Hat experts to help you get the mo
 
 * [Configure GitLab as an identity provider for ROSA/OSD](/experts/idp/gitlab)
 * [Configure GitLab as an identity provider for ARO](/experts/idp/gitlab-aro)
-* [Configure Azure AD as an identity provider for ARO](/experts/idp/azuread-aro)
-* [Configure Azure AD as an identitiy provider for ARO with group claims](/experts/idp/group-claims/aro/)
-* [Configure Azure AD as an identitiy provider for ROSA with group claims](/experts/idp/group-claims/rosa/)
-* [Configure Azure AD as an identity provider for ROSA/OSD](/experts/idp/azuread)
-* [Configure Azure AD as an identity provider for ARO via the CLI](/experts/idp/azuread-aro-cli)
-* [Configure Red Hat SSO with Azure AD as a Federated Identity Provider for ARO](/experts/idp/azuread-red-hat-sso)
+* [Configure Microsoft Entra ID (formerly Azure Active Directory) as an identity provider for ARO](/experts/idp/azuread-aro)
+* [Configure Microsoft Entra ID (formerly Azure Active Directory) as an identitiy provider for ARO with group claims](/experts/idp/group-claims/aro/)
+* [Configure Microsoft Entra ID (formerly Azure Active Directory) as an identitiy provider for ROSA with group claims](/experts/idp/group-claims/rosa/)
+* [Configure Microsoft Entra ID (formerly Azure Active Directory) as an identity provider for ROSA/OSD](/experts/idp/azuread)
+* [Configure Microsoft Entra ID (formerly Azure Active Directory) as an identity provider for ARO via the CLI](/experts/idp/azuread-aro-cli)
+* [Configure Red Hat SSO with Microsoft Entra ID (formerly Azure Active Directory) as a Federated Identity Provider for ARO](/experts/idp/azuread-red-hat-sso)
 * [Considerations when using AAD as IDP](/experts/idp/considerations-aad-ipd)
+* [Configuring Microsoft Entra ID (formerly Azure Active Directory) to emit group names instead of group IDs](/experts/idp/entra-id-with-group-names)
 
 ### Configuring Group Synchronization
 

content/idp/azuread-aro-cli/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2023-03-31'
-title: Configure Azure AD as an OIDC identity provider for ARO with cli
+title: Configure Microsoft Entra ID as an OIDC identity provider for ARO with cli
 tags: ["Azure", "ARO"]
 authors:
   - Shaozhen Ding

content/idp/azuread-aro/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2022-09-23'
-title: Configure ARO to use Azure AD
+title: Configure ARO to use Microsoft Entra ID
 tags: ["Azure", "ARO"]
 authors:
   - Michael McNeill

content/idp/azuread-red-hat-sso/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2023-06-20'
-title: Configure Red Hat SSO with Azure AD as a Federated Identity Provider
+title: Configure Red Hat SSO with Microsoft Entra ID as a Federated Identity Provider
 tags: ["Azure", "SSO", "Keycloak"]
 authors:
   - Dustin Scott

content/idp/azuread/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2022-09-23'
-title: Configure Azure AD as an OIDC identity provider for ROSA/OSD
+title: Configure Microsoft Entra ID as an OIDC identity provider for ROSA/OSD
 tags: ["Azure", "ROSA", "OSD"]
 authors:
   - Michael McNeill

content/idp/entra-id-with-group-names/index.md

@@ -0,0 +1,100 @@
+---
+date: '2024-10-03T0:00:00.0000'
+title: Configuring Microsoft Entra ID to emit group names
+tags: ["Azure", "IDP", "ARO", "ROSA", "Entra ID"]
+authors:
+  - Michael McNeill
+---
+
+In this guide, we will configure an existing Microsoft Entra ID (formerly Azure Active Directory) identity provider to emit the group name instead of the group ID for optional group claims. This will allow you to reference group names in your role bindings instead of the group ID. 
+
+{{% alert state="warning" %}}
+The ability to [emit group names instead of group IDs](https://learn.microsoft.com/en-us/entra/identity/hybrid/connect/how-to-connect-fed-group-claims#emit-cloud-only-group-display-name-in-token) is a preview feature made available by Microsoft and is subject to their terms and conditions around preview features of their services. 
+{{% /alert %}}
+
+### Prerequisites
+
+Before we begin, ensure that you have properly configured Microsoft Entra ID as an identity provider in your cluster following the guide specific to your platform:
+* [Red Hat OpenShift Service on AWS (ROSA)](https://docs.openshift.com/rosa/cloud_experts_tutorials/cloud-experts-entra-id-idp.html)
+* [Azure Red Hat OpenShift (ARO)](../group-claims/aro/)
+
+In addition, ensure that you have the necessary permissions to modify the Microsoft Entra ID app registration in the Azure Portal.
+
+{{% alert state="info" %}}
+Microsoft Entra ID Free is not able to emit group names instead of group IDs. 
+{{% /alert %}}
+
+### Procedure
+
+1. Login to the [Microsoft Azure portal](https://portal.azure.com) and navigate to the _Microsoft Entra ID_ service, then click on the _App registrations_ blade. 
+![Azure Portal - Microsoft Entra ID with arrow pointing at the App registrations menu item](./images/entra-id-blade.png)
+
+1. Locate your App registration and click on it. 
+
+1. Expand the _Manage_ sidebar menu, and click on the _Manifest_ blade.
+![Azure Portal - App registration overview page with arrow pointing at the Manage sidebar menu and the Manifest blade](./images/app-registrations-overview.png)
+
+1. Download the _Microsoft Graph App Manifest_ to keep as a backup, just in case.
+![Azure Portal - App registration manifest with arrow pointing at the Download button](./images/entra-id-manifest-download.png)
+
+1. Locate the setting `groupMembershipClaims` and ensure it is set to `ApplicationGroup`. This option includes only groups that are assigned to the application.
+
+    {{% alert state="warning" %}}
+Before changing this value, ensure that the groups you wish to include in your claims are attached to your Microsoft Entra ID application. Failure to do so may result in unexpected behavior including the removal of group memberships used for role bindings. For more information on how to add groups to your Microsoft Entra ID application, see the [Microsoft documentation](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/assign-user-or-group-access-portal).
+{{% /alert %}}
+
+    ![Azure Portal - App registration manifest with groupMembershipClaims value highlighted](./images/entra-id-manifest-groupmembershipclaims.png)
+
+1. Locate the `groups` claims under the `optionalClaims` section of the manifest. There should be three, one under `accessToken`, one under `idToken`, and one under `saml2Token`. Edit the `additionalProperties` field of the `groups` claims for the `idToken` _only_. You will change the `additionalProperties` field to look like this:
+    ```json
+    ...
+        "optionalClaims": {
+            "idToken": [
+                {
+                    "name": "groups",
+                    "source": null,
+                    "essential": false,
+                    "additionalProperties": [
+                        "sam_account_name",
+                        "cloud_displayname"
+                    ]
+                }
+            ],
+    ...
+    ```
+
+1. Save your changes.
+![Azure Portal - App registration manifest with arrow pointing at the Save button](./images/entra-id-manifest-save.png)
+
+1. If you are already logged into the OpenShift Web Console, logout. Once you are logged out of the cluster, log back in using the Microsoft Entra ID. You should now see group membership populated with group names instead of group IDs.
+![OpenShift Web Console - Groups page demonstrating Entra ID created groups](./images/openshift-groups.png)
+
+    You can see these groups were synced from Microsoft Entra ID by running the `oc get groups -o yaml` command. Your output will look something like this (note the `oauth.openshift.io` annotations):
+
+    ```yaml
+    apiVersion: v1
+    items:
+    - apiVersion: user.openshift.io/v1
+      kind: Group
+      metadata:
+        annotations:
+          oauth.openshift.io/generated: "true"
+          oauth.openshift.io/idp.EntraID: synced
+        name: group-1
+      users:
+      - michael@demo
+    - apiVersion: user.openshift.io/v1
+      kind: Group
+      metadata:
+        annotations:
+          oauth.openshift.io/generated: "true"
+          oauth.openshift.io/idp.EntraID: synced
+        name: group-2
+      users:
+      - michael@demo
+    kind: List
+    metadata:
+      resourceVersion: ""
+    ```
+
+Congratulations! You are now able to reference your group names in role bindings instead of group IDs.

content/idp/group-claims/aro/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2023-05-24'
-title: Configure ARO to use Azure AD Group Claims
+title: Configure ARO to use Microsoft Entra ID Group Claims
 authors:
   - Michael McNeill
   - Ricardo Martins

content/idp/group-claims/rosa/index.md

@@ -1,6 +1,6 @@
 ---
 date: '2022-09-19'
-title: Configure ROSA to use Azure AD Group Claims
+title: Configure ROSA to use Microsoft Entra ID Group Claims
 authors:
   - Michael McNeill
   - Paul Czarkowski