Skip to content

Commit 48b7666

Browse files
authored
Merge branch 'main' into RHIDP-5372-Consistency-for-references-to-the-application-configuration-file
2 parents 3c74607 + 2b0ac03 commit 48b7666

File tree

34 files changed

+713
-174
lines changed

34 files changed

+713
-174
lines changed

artifacts/attributes.adoc

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -85,75 +85,69 @@
8585
:gcp-brand-name: Google Cloud Platform
8686
:gcp-short: GCP
8787

88-
// Release Notes
89-
:rn-product-title: Release notes for Red Hat Developer Hub
90-
91-
// Red Hat Developer Hub administration guide
92-
:ag-product-title: Administration guide for Red Hat Developer Hub
93-
94-
// Red Hat Developer Hub getting started guide
95-
:gs-product-title: Getting started with Red Hat Developer Hub
96-
97-
// Backstage Plugins for Red Hat Developer Hub
98-
//:bs-product-title: Backstage Plugins for Red Hat Developer Hub
99-
100-
// User Guide
101-
:ug-product-title: Red Hat Developer Hub User Guide
10288

10389
// Links
10490

10591

106-
:LinkPluginsGuide: https://access.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/configuring_plugins_in_red_hat_developer_hub/index
107-
:NameOfPluginsGuide: Configuring plugins in {product}
108-
109-
:release-notes-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/release_notes/index
110-
:release-notes-title: Release notes
111-
112-
:installing-and-viewing-dynamic-plugins-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_and_viewing_dynamic_plugins/index
113-
:installing-and-viewing-dynamic-plugins-title: Installing and viewing dynamic plugins
114-
115-
:authentication-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authentication/index
116-
:authentication-book-title: Authentication
117-
118-
:authorization-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authorization/index
119-
:authorization-book-title: Authorization
120-
121-
:configuring-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/configuring/index
122-
:configuring-book-title: Configuring
92+
:discover-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Discover
93+
:about-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/about_red_hat_developer_hub/index
94+
:about-book-title: About {product}
12395

124-
:customizing-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/customizing/index
125-
:customizing-book-title: Customizing
96+
:release-notes-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Release Notes
97+
:release-notes-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/red_hat_developer_hub_release_notes/index
98+
:release-notes-book-title: {product} release notes
12699

127-
:installing-on-osd-on-gcp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_dedicated_on_google_cloud_platform/index
128-
:installing-on-osd-on-gcp-book-title: Installing {product} on {gcp-brand-name} on {gcp-brand-name}
129-
130-
:installing-on-ocp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_container_platform/index
100+
:install-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Install
131101
:installing-on-ocp-book-title: Installing {product} on {ocp-short}
132-
133-
:installing-on-gke-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_google_kubernetes_engine/index
134-
:installing-on-gke-book-title: Installing {product} on {gke-brand-name}
135-
136-
:installing-on-eks-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_amazon_elastic_kubernetes_service/index
102+
:installing-on-ocp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_container_platform/index
137103
:installing-on-eks-book-title: Installing {product} on {eks-brand-name}
138-
139-
:installing-on-aks-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_microsoft_azure_kubernetes_service/index
104+
:installing-on-eks-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_amazon_elastic_kubernetes_service/index
140105
:installing-on-aks-book-title: Installing {product} on {aks-brand-name}
141-
142-
:installing-in-air-gap-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_in_an_air-gapped_environment/index
106+
:installing-on-aks-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_microsoft_azure_kubernetes_service/index
107+
:installing-on-osd-on-gcp-book-title: Installing {product} on {gcp-brand-name} on {gcp-brand-name}
108+
:installing-on-osd-on-gcp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_dedicated_on_google_cloud_platform/index
109+
:installing-on-gke-book-title: Installing {product} on {gke-brand-name}
110+
:installing-on-gke-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_google_kubernetes_engine/index
143111
:installing-in-air-gap-book-title: Installing {product} in an air-gapped environment
112+
:installing-in-air-gap-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_in_an_air-gapped_environment/index
144113

114+
:upgrade-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Upgrade
145115
:upgrading-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/upgrading_red_hat_developer_hub/index
146116
:upgrading-book-title: Upgrading {product}
147117

118+
:configure-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Configure
119+
:configuring-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/configuring_red_hat_developer_hub/index
120+
:configuring-book-title: Configuring {product}
121+
:customizing-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/customizing_red_hat_developer_hub/index
122+
:customizing-book-title: Customizing {product}
123+
:techdocs-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/techdocs_for_red_hat_developer_hub/index
124+
:techdocs-book-title: TechDocs for {product}
125+
126+
:control-access-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Control access
127+
:authentication-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authentication_in_red_hat_developer_hub/index
128+
:authentication-book-title: Authentication in {product}
129+
:authorization-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authorization_in_red_hat_developer_hub/index
130+
:authorization-book-title: Authorization in {product}
131+
132+
:observability-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Observability
133+
:audit-log-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/audit_logs_in_red_hat_developer_hub/index
134+
:audit-log-book-title: Audit logs in {product}
135+
:monitoring-and-logging-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/monitoring_and_logging/index
136+
:monitoring-and-logging-book-title: Monitoring and logging
148137
:telemetry-data-collection-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/telemetry_data_collection/index
149138
:telemetry-data-collection-book-title: Telemetry data collection
150139

151-
:audit-log-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/audit_log/index
152-
:audit-log-book-title: Audit log
140+
:extend-category-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/#Extend
141+
:introduction-to-plugins-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/introduction_to_plugins/index
142+
:introduction-to-plugins-book-title: Introduction to plugins
143+
:configuring-dynamic-plugins-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/introduction_to_plugins/index
144+
:configuring-dynamic-plugins-book-title: Configuring dynamic plugins
145+
:installing-and-viewing-plugins-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_and_viewing_plugins_in_red_hat_developer_hub/index
146+
:installing-and-viewing-plugins-book-title: Installing and viewing plugins in {product}
147+
:using-dynamic-plugins-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_and_viewing_plugins_in_red_hat_developer_hub/index
148+
:using-dynamic-plugins-book-title: Using dynamic plugins
149+
:dynamic-plugins-reference-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/dynamic_plugins_reference/index
150+
:dynamic-plugins-reference-book-title: Dynamic plugins reference
153151

154-
:monitoring-and-logging-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/monitoring_and_logging/index
155-
:monitoring-and-logging-book-title: Monitoring and logging
156152

157-
:plugins-configure-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/configuring_dynamic_plugins/index
158-
:plugins-configure-book-title: Configuring dynamic plugins
159153

artifacts/rhdh-plugins-reference/argocd/argocd-plugin-admin.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,6 @@ If using the label selector annotation (backstage.io/kubernetes-label-selector),
226226
[role="_additional-resources"]
227227
.Additional resources
228228

229-
* The package path, scope, and name of the {company-name} ArgoCD plugin has changed since 1.2. For more information, see link:{release-notes-url}#removed-functionality-rhidp-4293[Breaking Changes] in the _{rn-product-title}_.
229+
* The package path, scope, and name of the {company-name} ArgoCD plugin has changed since 1.2. For more information, see link:{release-notes-book-url}#removed-functionality-rhidp-4293[Breaking Changes] in the _{release-notes-book-title}_.
230230

231-
* For more information on installing dynamic plugins, see link:{installing-and-viewing-dynamic-plugins-url}[{installing-and-viewing-dynamic-plugins-title}].
231+
* For more information on installing dynamic plugins, see link:{installing-and-viewing-plugins-book-url}[{installing-and-viewing-plugins-book-title}].

artifacts/rhdh-plugins-reference/argocd/argocd-plugin-readme.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ image::rhdh-plugins-reference/deployment_summary.png[Deployment summary]
3333
[role="_additional-resources"]
3434
.Additional resources
3535

36-
* For more information on installing dynamic plugins, see link:{installing-and-viewing-dynamic-plugins-url}[{installing-and-viewing-dynamic-plugins-title}].
36+
* For more information on installing dynamic plugins, see link:{installing-and-viewing-plugins-book-url}[{installing-and-viewing-plugins-book-title}].

artifacts/rhdh-plugins-reference/argocd/argocd-plugin-user.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ image::rhdh-plugins-reference/deployment_summary.png[Deployment summary]
3131
[role="_additional-resources"]
3232
.Additional resources
3333

34-
* For more information on installing dynamic plugins, see link:{installing-and-viewing-dynamic-plugins-url}[{installing-and-viewing-dynamic-plugins-title}].
34+
* For more information on installing dynamic plugins, see link:{installing-and-viewing-plugins-book-url}[{installing-and-viewing-plugins-book-title}].
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
:context: configuring-a-floating-action-button
3+
[id="{context}"]
4+
= Configuring a floating action button in {product}
5+
6+
You can use the floating action button plugin to configure any action button as a floating button in any page in the {product-short} instance as you want. The floating action button plugin is disabled by default. You can also configure floating action buttons to display as submenu options within the main floating action button by assigning the floating action buttons to the same slot.
7+
8+
include::modules/configuring-a-floating-action-button/proc-configuring-floating-action-button-as-a-dynamic-plugin.adoc[leveloffset=+1]

assemblies/assembly-configuring-techdocs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ After you configure {odf-name} to store the files that TechDocs generates, you c
1717
[role="_additional-resources"]
1818
.Additional resources
1919

20-
* For more information, see link:{LinkPluginsGuide}[Configuring plugins in {product}].
20+
* For more information, see link:{configuring-dynamic-plugins-book-url}[{configuring-dynamic-plugins-book-title}].
2121
2222
include::modules/customizing-techdocs/con-techdocs-configure-storage.adoc[leveloffset=+1]
2323

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[id='con-Kubernetes-custom-actions_{context}']
2+
= Kubernetes custom actions in {product}
3+
4+
include::{docdir}/artifacts/snip-technology-preview.adoc[]
5+
6+
With Kubernetes custom actions, you can create and manage Kubernetes resources.
7+
8+
The Kubernetes custom actions plugin is preinstalled and disabled on a {product-short} instance by default. You can disable or enable the Kubernetes custom actions plugin, and change other parameters, by configuring the {product} Helm chart.
9+
10+
[NOTE]
11+
====
12+
Kubernetes scaffolder actions and Kubernetes custom actions refer to the same concept throughout this documentation.
13+
====
14+
15+
16+
include::modules/using-kubernetes-custom-actions/proc-enable-kubernetes-custom-actions-plugin.adoc[leveloffset=+1]
17+
18+
include::modules/using-kubernetes-custom-actions/proc-using-kubernetes-custom-actions-plugin.adoc[leveloffset=+1]
19+
20+
include::modules/using-kubernetes-custom-actions/ref-creating-a-template-using-kubernetes-custom-actions.adoc[leveloffset=+1]
21+
22+
include::modules/using-kubernetes-custom-actions/ref-supported-kubernetes-custom-actions.adoc[leveloffset=+2]

assemblies/dynamic-plugins/assembly-configuring-rhdh-plugins.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ include::../assembly-bulk-importing-from-github.adoc[leveloffset=+1]
2828

2929
include::../assembly-using-servicenow.adoc[leveloffset=+1]
3030

31+
include::../assembly-using-kubernetes-custom-actions.adoc[leveloffset=+1]
32+
3133
// Overriding Core Backend Service Configuration
3234
include::../modules/dynamic-plugins/con-overriding-core-backend-services.adoc[leveloffset=+1]

assemblies/dynamic-plugins/assembly-rhdh-installing-dynamic-plugins.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include::../modules/dynamic-plugins/ref-rh-supported-plugins.adoc[leveloffset=+3
1515

1616
[NOTE]
1717
====
18-
* For more information about configuring KeyCloak, see link:{plugins-configure-book-url}[{plugins-configure-book-title}].
18+
* For more information about configuring KeyCloak, see link:{configuring-dynamic-plugins-book-url}[{configuring-dynamic-plugins-book-title}].
1919
2020
* For more information about configuring TechDocs, see link:{customizing-book-url}#configuring-techdocs[Configuring TechDocs].
2121
====
@@ -29,7 +29,7 @@ include::../modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc[leveloffset
2929

3030
[NOTE]
3131
====
32-
* A new Technology Preview plugin for Red Hat Ansible Automation Platform (RHAAP) is available, which replaces this older one. See link:{LinkPluginsGuide}#rhdh-compatible-plugins[Other installable plugins] in the _{NameOfPluginsGuide} guide_ for further details. See xref:rhdh-compatible-plugins[Dynamic plugins support matrix].
32+
* A new Technology Preview plugin for Red Hat Ansible Automation Platform (RHAAP) is available, which replaces this older one. See link:{configuring-dynamic-plugins-book-url}#rhdh-compatible-plugins[Other installable plugins] in _{configuring-dynamic-plugins-book-title}_ for further details. See xref:rhdh-compatible-plugins[Dynamic plugins support matrix].
3333
====
3434

3535
// Community plugins

modules/authentication/proc-enabling-authentication-with-github.adoc

Lines changed: 71 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ TIP: If you plan to make changes using the GitHub API, ensure that `Read and wri
5151
* **Private key**
5252
* **Webhook secret**
5353

54-
. To add your GitHub credentials to {product-short}, add the following key/value pairs to link:{plugins-configure-book-url}#provisioning-your-custom-configuration[your {product-short} secrets]:
54+
. To add your GitHub credentials to {product-short}, add the following key/value pairs to link:{configuring-dynamic-plugins-book-url}#provisioning-your-custom-configuration[your {product-short} secrets]:
5555
+
5656
`AUTH_GITHUB_APP_ID`:: Enter the saved **App ID**.
5757
`AUTH_GITHUB_CLIENT_ID`:: Enter the saved **Client ID**.
@@ -70,11 +70,11 @@ TIP: If you plan to make changes using the GitHub API, ensure that `Read and wri
7070
[source,yaml]
7171
----
7272
auth:
73-
environment: production
73+
environment: production # <1>
7474
providers:
7575
github:
7676
production:
77-
clientId: ${AUTH_GITHUB_CLIENT_ID}
77+
clientId: ${AUTH_GITHUB_CLIENT_ID} # <2>
7878
clientSecret: ${AUTH_GITHUB_CLIENT_SECRET}
7979
integrations:
8080
github:
@@ -87,8 +87,11 @@ integrations:
8787
webhookSecret: ${GITHUB_WEBHOOK_SECRET}
8888
privateKey: |
8989
${GITHUB_PRIVATE_KEY_FILE}
90-
signInPage: github
90+
signInPage: github # <3>
9191
----
92+
<1> Mark the environment as `production` and disable the Guest login option in the {product-short} login page.
93+
<2> Apply the GitHub credentials configured in your {product-short} secrets.
94+
<3> To enable the GitHub provider as your {product-short} sign-in provider.
9295

9396
`environment: production`::
9497
Mark the environment as `production` to hide the Guest login in the {product-short} home page.
@@ -161,6 +164,70 @@ auth:
161164
----
162165
////
163166

167+
`sessionDuration`::
168+
Lifespan of the user session.
169+
Enter a duration in `ms` library format (such as '24h', '2 days'), ISO duration, or "human duration" as used in code.
170+
+
171+
.`app-config-rhdh.yaml` fragment with optional `sessionDuration` field
172+
[source,yaml,subs="+quotes"]
173+
----
174+
auth:
175+
providers:
176+
github:
177+
production:
178+
sessionDuration: { hours: 24 }
179+
----
180+
181+
`signIn` ::
182+
183+
`resolvers`:::
184+
After successful authentication, the user signing in must be resolved to an existing user in the {product-short} catalog. To best match users securely for your use case, consider configuring a specific resolver. Enter the resolver list to override the default resolver: `usernameMatchingUserEntityName`.
185+
+
186+
The authentication provider tries each sign-in resolver in order until it succeeds, and fails if none succeed.
187+
+
188+
WARNING: In production mode, only configure one resolver to ensure users are securely matched.
189+
190+
`resolver`::::
191+
Enter the sign-in resolver name.
192+
Available resolvers:
193+
194+
* `usernameMatchingUserEntityName`
195+
* `preferredUsernameMatchingUserEntityName`
196+
* `emailMatchingUserEntityProfileEmail`
197+
198+
`dangerouslyAllowSignInWithoutUserInCatalog: true`::::
199+
Configure the sign-in resolver to bypass the user provisioning requirement in the {product-short} software catalog.
200+
+
201+
WARNING: Use `dangerouslyAllowSignInWithoutUserInCatalog` to explore {product-short} features, but do not use it in production.
202+
+
203+
.`app-config-rhdh.yaml` fragment with optional field to allow signing in users absent from the software catalog
204+
[source,yaml]
205+
----
206+
auth:
207+
environment: production
208+
providers:
209+
github:
210+
production:
211+
clientId: ${AUTH_GITHUB_CLIENT_ID}
212+
clientSecret: ${AUTH_GITHUB_CLIENT_SECRET}
213+
signIn:
214+
resolvers:
215+
- resolver: usernameMatchingUserEntityName
216+
dangerouslyAllowSignInWithoutUserInCatalog: true
217+
integrations:
218+
github:
219+
- host: ${GITHUB_HOST_DOMAIN}
220+
apps:
221+
- appId: ${AUTH_GITHUB_APP_ID}
222+
clientId: ${AUTH_GITHUB_CLIENT_ID}
223+
clientSecret: ${GITHUB_CLIENT_SECRET}
224+
webhookUrl: ${GITHUB_WEBHOOK_URL}
225+
webhookSecret: ${GITHUB_WEBHOOK_SECRET}
226+
privateKey: |
227+
${GITHUB_PRIVATE_KEY_FILE}
228+
signInPage: github
229+
----
230+
164231
[TIP]
165232
====
166233
To enable GitHub integration with a different authentication provider, complete the following configurations:
@@ -194,8 +261,6 @@ signInPage: __<your_main_authentication_provider>__
194261
----
195262
====
196263

197-
--
198-
199264
.Verification
200265
. Go to the {product-short} login page.
201266
. Your {product-short} sign-in page displays *Sign in using GitHub* and the Guest user sign-in is disabled.

0 commit comments

Comments
 (0)