Skip to content

Commit 313f266

Browse files
openshift-cherrypick-robotjmagakthemr0c
authored
[release-1.5] RHIDP-6410 - added steps to Azure authentication procedures (#1193)
Co-authored-by: Judith Magak <[email protected]> Co-authored-by: Fabrice Flore-Thébault <[email protected]>
1 parent 4332572 commit 313f266

4 files changed

+51
-50
lines changed

modules/authentication/proc-enabling-authentication-with-microsoft-azure.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
* `offline_access`
2727
* `openid`
2828
* `profile`
29-
* `User.Read`
29+
* `User.Read.All`
30+
* `GroupMember.Read.All`
3031
* Optional custom scopes for the Microsoft Graph API that you define both in this section and in the `{my-app-config-file}` {product-short} configuration file.
3132
[NOTE]
3233
====
@@ -125,7 +126,7 @@ After successful authentication, the user signing in must be resolved to an exis
125126
+
126127
The authentication provider tries each sign-in resolver in order until it succeeds, and fails if none succeed.
127128
+
128-
WARNING: In production mode, only configure one resolver to ensure users are securely matched.
129+
WARNING: In production mode, only configure one resolver to ensure users are securely matched.
129130

130131
`resolver`::::
131132
Enter the sign-in resolver name.

modules/authentication/proc-provisioning-users-from-github-to-the-software-catalog.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ Consider configuring {product-short} to provision users from GitHub to the softw
1010
** `GITHUB_ORGANIZATION`
1111

1212
.Procedure
13+
. link:{installing-and-viewing-plugins-book-url}[Enable the `backstage-plugin-catalog-backend-module-github-dynamic` plugin].
14+
+
15+
.`dynamic-plugins.yaml` file fragment
16+
[code,yaml]
17+
----
18+
plugins:
19+
- package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic'
20+
disabled: false
21+
----
1322

14-
* To enable GitHub member discovery, edit your custom {product-short} ConfigMap, such as `app-config-rhdh`, and add the following lines to the `{my-app-config-file}` content:
23+
. To enable GitHub member discovery, edit `{my-app-config-file}`, your custom {product-short} configuration file:
1524
+
1625
--
1726
[id=githubProviderId]

modules/authentication/proc-provisioning-users-from-microsoft-azure-to-the-software-catalog.adoc

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@ To authenticate users with Microsoft Azure, after xref:enabling-authentication-w
88
* You have xref:enabling-authentication-with-microsoft-azure[enabled authentication with Microsoft Azure].
99
1010
.Procedure
11-
* To enable Microsoft Azure member discovery, edit your custom {product-short} ConfigMap, such as `app-config-rhdh`, and add following lines to the `{my-app-config-file}` content:
11+
. link:{installing-and-viewing-plugins-book-url}[Enable the `backstage-plugin-catalog-backend-module-msgraph-dynamic` plugin].
12+
+
13+
.`dynamic-plugins.yaml` file fragment
14+
[code,yaml]
15+
----
16+
plugins:
17+
- package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic'
18+
disabled: false
19+
----
20+
21+
. To enable {azure-brand-name} member discovery, edit `{my-app-config-file}`, your custom {product-short} configuration file::
1222
+
1323
[id=microsoftGraphOrgProviderId]
1424
.`{my-app-config-file}` fragment with mandatory `microsoftGraphOrg` fields
@@ -22,6 +32,10 @@ catalog:
2232
tenantId: ${AUTH_AZURE_TENANT_ID}
2333
clientId: ${AUTH_AZURE_CLIENT_ID}
2434
clientSecret: ${AUTH_AZURE_CLIENT_SECRET}
35+
schedule:
36+
frequency: { hours: 1 }
37+
timeout: { minutes: 50 }
38+
initialDelay: { minutes: 50 }
2539
----
2640

2741
`target: https://graph.microsoft.com/v1.0`::
@@ -31,6 +45,19 @@ You might change this parameter to use a different version, such as the link:htt
3145
`tenandId`, `clientId` and `clientSecret`::
3246
Use the {product-short} application information you created in Microsoft Azure and configured in OpenShift as secrets.
3347

48+
`schedule`::
49+
50+
`frequency`:::
51+
Enter the schedule frequency as cron, ISO duration, or human duration as used in code.
52+
53+
`timeout`:::
54+
Enter the schedule timeout as ISO duration or human duration as used in code.
55+
56+
`initialDelay`:::
57+
Enter the schedule initial delay as ISO duration or human duration as used in code.
58+
+
59+
TIP: In a large organization, this plugin can take a long time. Therefore, avoid setting a low frequency or timeout when importing a large number of users and groups for the first time.
60+
3461
Optional: Consider adding the following optional `microsoftGraphOrg.providerId` fields:
3562

3663
[id=authority]
@@ -228,51 +255,6 @@ catalog:
228255
select: ['id', 'displayName', 'description']
229256
----
230257

231-
`schedule.frequency`::
232-
To specify custom schedule frequency.
233-
Supports cron, ISO duration, and "human duration" as used in code.
234-
+
235-
.`{my-app-config-file}` fragment with optional `schedule.frequency` field
236-
[source,yaml]
237-
----
238-
catalog:
239-
providers:
240-
microsoftGraphOrg:
241-
providerId:
242-
schedule:
243-
frequency: { hours: 1 }
244-
----
245-
246-
`schedule.timeout`::
247-
To specify custom timeout.
248-
Supports ISO duration and "human duration" as used in code.
249-
+
250-
.`{my-app-config-file}` fragment with optional `schedule.timeout` field
251-
[source,yaml]
252-
----
253-
catalog:
254-
providers:
255-
microsoftGraphOrg:
256-
providerId:
257-
schedule:
258-
timeout: { minutes: 50 }
259-
----
260-
261-
`schedule.initialDelay`::
262-
To specify custom initial delay.
263-
Supports ISO duration and "human duration" as used in code.
264-
+
265-
.`{my-app-config-file}` fragment with optional `schedule.initialDelay` field
266-
[source,yaml]
267-
----
268-
catalog:
269-
providers:
270-
microsoftGraphOrg:
271-
providerId:
272-
schedule:
273-
initialDelay: { seconds: 15}
274-
----
275-
276258
.Verification
277259
. Check the console logs to verify that the synchronization is completed.
278260
+

modules/authentication/proc-provisioning-users-from-rhbk-to-the-software-catalog.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55
* You xref:enabling-authentication-with-rhbk[enabled authentication with {rhbk}].
66

77
.Procedure
8+
. link:{installing-and-viewing-plugins-book-url}[Enable the `backstage-plugin-catalog-backend-module-keycloak-dynamic` plugin].
9+
+
10+
.`dynamic-plugins.yaml` file fragment
11+
[code,yaml]
12+
----
13+
plugins:
14+
- package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-keycloak-dynamic'
15+
disabled: false
16+
----
817

9-
* To enable {rhbk} member discovery, edit your custom {product-short} ConfigMap, such as `app-config-rhdh`, and add the following lines to the `{my-app-config-file}` content:
18+
. To enable {rhbk} member discovery, edit `{my-app-config-file}`, your custom {product-short} configuration file:
1019
+
1120
--
1221
[id=keycloakOrgProviderId]

0 commit comments

Comments
 (0)