Skip to content

Commit c82f657

Browse files
authored
Merge branch 'main' into rhidp-5592
2 parents a5957c6 + 7b35cc2 commit c82f657

16 files changed

+33
-31
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ Save the value for the next step:
2323
* **Client ID**
2424
* **Client Secret**
2525

26-
.. Configure your {rhbk} realm for performance and security:
27-
... Navigate to the **Configure** > **Realm Settings**.
28-
... Set the **Access Token Lifespan** to a value greater than five minutes (preferably 10 or 15 minutes) to prevent performance issues from frequent refresh token requests for every API call.
29-
... Enable the **Revoke Refresh Token** option to improve security by enabling the refresh token rotation strategy.
30-
3126
.. To prepare for the verification steps, in the same realm, get the credential information for an existing user or link:https://docs.redhat.com/en/documentation/red_hat_build_of_keycloak/24.0/html-single/getting_started_guide/index#getting-started-zip-create-a-user[create a user]. Save the user credential information for the verification steps.
3227

3328
. To add your {rhsso} credentials to your {product-short}, add the following key/value pairs to link:{plugins-configure-book-url}#provisioning-your-custom-configuration[your {product-short} secrets]:
@@ -182,6 +177,13 @@ auth:
182177

183178
--
184179

180+
.Security consideration
181+
If multiple valid refresh tokens are issued due to frequent refresh token requests, older tokens will remain valid until they expire. To enhance security and prevent potential misuse of older tokens, enable a refresh token rotation strategy in your {rhbk} realm.
182+
183+
. From the *Configure* section of the navigation menu, click *Realm Settings*.
184+
. From the *Realm Settings* page, click the *Tokens* tab.
185+
. From the *Refresh tokens* section of the *Tokens* tab, toggle the *Revoke Refresh Token* to the *Enabled* position.
186+
185187
.Verification
186188
. Go to the {product-short} login page.
187189
. Your {product-short} sign-in page displays *Sign in using OIDC* and the Guest user sign-in is disabled.

modules/authorization/proc-defining-authorizations-in-external-files-by-using-the-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ $ oc create configmap rbac-policies \
7575
--from-file=rbac-conditional-policies.yaml
7676
----
7777

78-
. Update your {product-short} `Backstage` custom resource to mount in the {product-short} filesystem your files from the `rbac-policies` config map:
78+
. Update link:{configuring-book-url}[your `{product-custom-resource-type}` custom resource] to mount in the {product-short} filesystem your files from the `rbac-policies` config map:
7979
+
80-
.`Backstage` Custom resource fragment
80+
.`{product-custom-resource-type}` custom resource fragment
8181
[source,yaml]
8282
----
8383
apiVersion: rhdh.redhat.com/v1alpha3

modules/configuring-a-proxy/proc-configuring-proxy-in-operator-deployment.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For Operator-based deployment, the approach you use for proxy configuration is b
5959
----
6060

6161

62-
* As a developer, set the proxy information in your custom resource (CR) file as shown in the following example:
62+
* As a developer, set the proxy information in your `{product-custom-resource-type}` CR file as shown in the following example:
6363
+
6464
.Example: Setting proxy variables in a CR file
6565
[source, yaml]

modules/configuring-deployment/proc-configuring-deployment-by-using-the-operator.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[id="configuring-the-deployment"]
2-
= Configuring {product} deployment when using the operator
2+
= Configuring {product} deployment when using the Operator
33

4-
The {product} operator exposes a `rhdh.redhat.com/v1alpha2` API Version of its Custom Resource Definition (CRD). This CRD exposes a generic `spec.deployment.patch` field, which gives you full control over the {product-short} Deployment resource. This field can be a fragment of the standard `apps.Deployment` Kubernetes object.
4+
The {product} Operator exposes a `rhdh.redhat.com/v1alpha2` API Version of its custom resource (CR). This CR exposes a generic `spec.deployment.patch` field, which gives you full control over the {product-short} Deployment resource. This field can be a fragment of the standard `apps.Deployment` Kubernetes object.
55

66
.Procedure
77

8-
. Create a {product-short} Custom Resource Definition with the following fields:
8+
. Create a `{product-custom-resource-type}` CR with the following fields:
99

1010
--
1111
.Example

modules/configuring-external-databases/proc-configuring-postgresql-instance-using-the-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ EOF
7474
<3> Optional: Provide the value based on the required link:https://www.postgresql.org/docs/15/libpq-connect.html#LIBPQ-CONNECT-SSLMODE[Secure Sockets Layer (SSL) mode].
7575
<4> Optional: Provide the value only if you need a TLS connection for your PostgreSQL instance.
7676

77-
. Create a `{product-custom-resource-type}` custom resource (CR):
77+
. Create your `{product-custom-resource-type}` custom resource (CR):
7878
+
7979
[source,terminal,subs="+attributes,+quotes"]
8080
----

modules/configuring-external-databases/proc-migrating-databases-to-an-external-server.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ done
7878
You can stop port forwarding when the copying of the data is complete. For more information about handling large databases and using the compression tools, see the link:https://www.postgresql.org/docs/current/backup-dump.html#BACKUP-DUMP-LARGE[Handling Large Databases] section on the PostgreSQL website.
7979
====
8080

81-
. Reconfigure your `Backstage` custom resource (CR). For more information, see link:{configuring-book-url}#proc-configuring-postgresql-instance-using-operator_configuring-external-postgresql-databases[Configuring an external PostgreSQL instance using the Operator].
81+
. Reconfigure your `{product-custom-resource-type}` custom resource (CR). For more information, see link:{configuring-book-url}#proc-configuring-postgresql-instance-using-operator_configuring-external-postgresql-databases[Configuring an external PostgreSQL instance using the Operator].
8282
. Check that the following code is present at the end of your `Backstage` CR after reconfiguration:
8383
+
8484
[source,yaml]

modules/configuring/proc-using-the-operator-to-run-rhdh-with-your-custom-configuration.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[id="using-the-operator-to-run-rhdh-with-your-custom-configuration"]
22
= Using the {product} operator to run {product-short} with your custom configuration
33

4-
To use the {product-short} operator to run {product} with your custom configuration, create a {product-custom-resource-type} custom resource that:
4+
To use the {product-short} operator to run {product} with your custom configuration, create your {product-custom-resource-type} custom resource (CR) that:
55

66
* Mounts files provisioned in your custom config maps.
77
* Injects environment variables provisioned in your custom secrets.
@@ -13,7 +13,7 @@ To use the {product-short} operator to run {product} with your custom configurat
1313

1414
.Procedure
1515

16-
. Author your {product-custom-resource-type} custom resource in a `{my-product-cr-name}.yaml` file to use your custom config maps and secrets.
16+
. Author your {product-custom-resource-type} CR in a `{my-product-cr-name}.yaml` file to use your custom config maps and secrets.
1717
+
1818
.Minimal `{my-product-cr-name}.yaml` custom resource example
1919
====
@@ -78,7 +78,7 @@ spec:
7878
Mandatory fields::
7979

8080
No fields are mandatory.
81-
You can create an empty {product-custom-resource-type} custom resource
81+
You can create an empty {product-custom-resource-type} CR
8282
and run {product-short} with the default configuration.
8383

8484
Optional fields::
@@ -198,7 +198,7 @@ spec:
198198
`spec.deployment`:::
199199
Optionally, xref:configuring-the-deployment[enter your deployment configuration].
200200

201-
. Apply your {product-custom-resource-type} custom resource to start or update your {product-short} instance.
201+
. Apply your {product-custom-resource-type} CR to start or update your {product-short} instance.
202202
+
203203
[source,terminal,subs="+attributes,+quotes"]
204204
----

modules/customizing-techdocs/proc-techdocs-configure-odf-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[id="proc-techdocs-configure-odf-operator_{context}"]
33
= Making object storage accessible to containers by using the Operator
44

5-
Creating a `ObjectBucketClaim` Custom Resource (CR) automatically generates both the {product-short} `ObjectBucketClaim` config map and secret. The config map and secret contain `ObjectBucket` access information. Adding the access information to the Operator configuration makes it accessible to the {product-short} container by adding the following environment variables to the container:
5+
Creating a `ObjectBucketClaim` custom resource (CR) automatically generates both the {product-short} `ObjectBucketClaim` config map and secret. The config map and secret contain `ObjectBucket` access information. Adding the access information to the Operator configuration makes it accessible to the {product-short} container by adding the following environment variables to the container:
66

77
* `BUCKET_NAME`
88
* `BUCKET_HOST`
@@ -21,7 +21,7 @@ These variables are then used in the TechDocs plugin configuration.
2121
2222
.Procedure
2323

24-
* In the {product-short} `Backstage` CR, enter the name of the {product-short} `ObjectBucketClaim` config map as the value for the `spec.application.extraEnvs.configMaps` field and enter the {product-short} `ObjectBucketClaim` secret name as the value for the `spec.application.extraEnvs.secrets` field. For example:
24+
* In your `{product-custom-resource-type}` CR, enter the name of the {product-short} `ObjectBucketClaim` config map as the value for the `spec.application.extraEnvs.configMaps` field and enter the {product-short} `ObjectBucketClaim` secret name as the value for the `spec.application.extraEnvs.secrets` field. For example:
2525
+
2626
[source,yaml]
2727
----

modules/dynamic-plugins/proc-config-dynamic-plugins-rhdh-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="proc-config-dynamic-plugins-rhdh-operator_{context}"]
77
= Installing dynamic plugins with the {product} Operator
88

9-
You can store the configuration for dynamic plugins in a `ConfigMap` object that your `Backstage` custom resource (CR) can reference.
9+
You can store the configuration for dynamic plugins in a `ConfigMap` object that your `{product-custom-resource-type}` custom resource (CR) can reference.
1010

1111
[NOTE]
1212
====
@@ -50,7 +50,7 @@ data:
5050
+
5151
image::rhdh/operator-install-2.png[]
5252

53-
. Add the `dynamicPluginsConfigMapName` field to your `Backstage` CR. For example:
53+
. Add the `dynamicPluginsConfigMapName` field to your `{product-custom-resource-type}` CR. For example:
5454
+
5555
[source,yaml]
5656
----

modules/dynamic-plugins/proc-topology-configure.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ annotations:
231231

232232
The Red Hat OpenShift Dev Spaces instance is not accessible using the source code editor if the `backstage.io/kubernetes-namespace` annotation is added to the `catalog-info.yaml` file.
233233

234-
To retrieve the instance URL, you require the CheCluster Custom Resource (CR). As the CheCluster CR is created in the openshift-devspaces namespace, the instance URL is not retrieved if the namespace annotation value is not openshift-devspaces.
234+
To retrieve the instance URL, you require the CheCluster custom resource (CR). As the CheCluster CR is created in the openshift-devspaces namespace, the instance URL is not retrieved if the namespace annotation value is not openshift-devspaces.
235235

236236
=== Label selector query annotation
237237
You can write your own custom label, which RHDH uses to find the Kubernetes resources. The label selector takes precedence over the ID annotations:

0 commit comments

Comments
 (0)