Skip to content

Commit 64d074c

Browse files
author
Jill Grant
authored
Merge pull request #288443 from johnmarco/jm-aro-sfi-image-fixes
ARO SFI image fixes
2 parents 46628c9 + 2a54f76 commit 64d074c

9 files changed

+0
-14
lines changed

articles/openshift/configure-azure-ad-ui.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@ Provide a name for the application, for example **aro-azuread-auth**, and fill i
4040

4141
Navigate to **Certificates & secrets** and click on **New client secret** and fill in the details. Make note of the key value, as you'll use it in a later stage. You won't be able to retrieve it again.
4242

43-
![Create a secret](media/aro4-ad-clientsecret.png)
44-
4543
Navigate to the **Overview** and make note of the **Application (client) ID** and **Directory (tenant) ID**. You'll need them in a later stage.
4644

47-
![Retrieve Application (client) and Directory (tenant) IDs](media/aro4-ad-ids.png)
48-
4945
## Configure optional claims
5046

5147
Application developers can use [optional claims](../active-directory/develop/active-directory-optional-claims.md) in their Microsoft Entra applications to specify which claims they want in tokens sent to their application.
@@ -60,8 +56,6 @@ We'll configure OpenShift to use the `email` claim and fall back to `upn` to set
6056

6157
Navigate to **Token configuration** and click on **Add optional claim**. Select **ID** then check the **email** and **upn** claims.
6258

63-
![Screenshot that shows the email and upn claims that were added.](media/aro4-ad-tokens.png)
64-
6559
## Assign users and groups to the cluster (optional)
6660

6761
Applications registered in a Microsoft Entra tenant are, by default, available to all users of the tenant who authenticate successfully. Microsoft Entra ID allows tenant administrators and developers to restrict an app to a specific set of users or security groups in the tenant.
@@ -105,12 +99,8 @@ Scroll down to select **Add** under **Identity Providers** and select **OpenID C
10599

106100
Fill in the name as **Microsoft Entra ID**, the **Client ID** as the **Application ID** and the **Client Secret**. The **Issuer URL** is formatted as such: `https://login.microsoftonline.com/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/v2.0`. Replace the placeholder with the Tenant ID you retrieved earlier.
107101

108-
![Fill in OAuth details](media/aro4-oauth-idp-1.png)
109-
110102
Scroll down to the **Claims** section and update the **Preferred Username** to use the value from the **upn** claim.
111103

112-
![Fill in claims details](media/aro4-oauth-idp-2.png)
113-
114104
<a name='verify-login-through-azure-active-directory'></a>
115105

116106
## Verify login through Microsoft Entra ID

articles/openshift/howto-deploy-with-s2i.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ https://console-openshift-console.apps.wzy5hg7x.eastus.aroapp.io/
6161

6262
Launch the console URL in a browser and login using the `kubeadmin` credentials.
6363

64-
:::image type="content" source="media/login.png" alt-text="Azure Red Hat OpenShift login screen":::
65-
6664
Switch to the *Developer* perspective instead of the *Administrator* perspective in the left-hand side menu and select `demoproject` in the list of projects. You should then be at the *Topology* page for the project.
6765

6866
:::image type="content" source="media/s2i/project-topology.png" alt-text="Azure Red Hat OpenShift project topology":::

articles/openshift/howto-deploy-with-serverless.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ https://console-openshift-console.apps.wzy5hg7x.eastus.aroapp.io/
5757

5858
Open a web browser and open the console URL. Log in using `kubeadmin` credentials.
5959

60-
:::image type="content" source="media/login.png" alt-text="A screenshot that shows the Azure Red Hat OpenShift log-in screen":::
61-
6260
## Install the OpenShift Serverless operator
6361

6462
When you're logged into the OpenShift web console, confirm that you're in *Administrator* view. Open the *Operator Hub* and select the **OpenShift Serverless** operator.
Binary file not shown.
-131 KB
Binary file not shown.
-140 KB
Binary file not shown.
-124 KB
Binary file not shown.
-103 KB
Binary file not shown.

articles/openshift/media/login.png

-168 KB
Binary file not shown.

0 commit comments

Comments
 (0)