Skip to content

Commit adb2953

Browse files
themr0cdeerskindollpabel-rh
authored
RHIDP-8548 Fix the 14 AsciiDocDITA.ExampleBlock errors (#1344)
* RHIDP-8548 Fix the 14 AsciiDocDITA.ExampleBlock errors Signed-off-by: Fabrice Flore-Thébault <[email protected]> * Apply suggestions from code review Co-authored-by: Jana Vrbkova <[email protected]> Co-authored-by: Priyanka Abel <[email protected]> * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review --------- Signed-off-by: Fabrice Flore-Thébault <[email protected]> Co-authored-by: Jana Vrbkova <[email protected]> Co-authored-by: Priyanka Abel <[email protected]>
1 parent 663fa36 commit adb2953

5 files changed

+59
-70
lines changed
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1+
:_mod-docs-content-type: PROCEDURE
12
[id="proc-configuring-high-availability-in-rhdh-helm-chart-deployment"]
23
= Configuring high availability in a {product} Helm chart deployment
34

4-
When you are deploying {product-short} using the Helm chart, you must set `replicas` to a value greater than `1` in your Helm chart. The default value for `replicas` is `1`.
5+
When you are deploying {product-short} using the Helm chart, you must set `replicas` to a value greater than `1` in your Helm chart. The default value for `replicas` is `1`.
56

67
.Procedure
7-
To configure your {product-short} Helm chart for high availability, complete the following step:
8-
9-
* In your Helm chart configuration file, set `replicas` to a value greater than `1`. For example:
8+
* In your Helm chart configuration file, set `replicas` to a value greater than `1`.
9+
+
10+
For example, to configure two replicas (one backup instance):
1011
+
11-
====
1212
[source,yaml,subs="+attributes,+quotes"]
1313
----
1414
upstream:
1515
backstage:
16-
replicas: _<replicas_value>_ <1>
16+
replicas: 2
1717
----
18-
====
19-
<1> Set the number of replicas based on the number of backup instances that you want to configure.
Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1+
:_mod-docs-content-type: PROCEDURE
12
[id="proc-configuring-high-availability-in-rhdh-operator-deployment"]
2-
= Configuring High availability in a {product} Operator deployment
3-
4-
{product-very-short} instances that are deployed with the Operator use configurations in the `{product-custom-resource-type}` custom resource. In the `{product-custom-resource-type}` custom resource, the default value for the `replicas` field is `1`. If you want to configure your {product-very-short} instance for high availability, you must set `replicas` to a value greater than `1`.
3+
= Configuring high availability in a {product} Operator deployment
54

5+
{product-very-short} instances that are deployed with the Operator use configurations in the `{product-custom-resource-type}` custom resource (CR).
6+
In the `{product-custom-resource-type}` CR, the default value for the `replicas` field is `1`.
7+
If you want to configure your {product-very-short} instance for high availability, you must set `replicas` to a value greater than `1`.
68

79
.Procedure
8-
9-
* In your `{product-custom-resource-type}` custom resource, set `replicas` to a value greater than `1`. For example:
10+
* In your `{product-custom-resource-type}` custom resource (CR), set `replicas` to a value greater than `1`.
11+
+
12+
For example, to configure two replicas (one backup instance):
1013
+
11-
====
1214
[source,yaml,subs="+attributes,+quotes"]
1315
----
14-
apiVersion: rhdh.redhat.com/v1alpha3
15-
kind: Backstage
16-
metadata:
17-
name: _<your_yaml_file>_
16+
apiVersion: rhdh.redhat.com/v1alpha3
17+
kind: Backstage
18+
metadata:
19+
name: _<your_yaml_file>_
1820
spec:
1921
deployment:
2022
patch:
21-
spec:
22-
...
23-
replicas: _<replicas_value>_ <1>
24-
...
23+
spec:
24+
replicas: 2
2525
----
26-
====
27-
<1> Set the number of replicas based on the number of backup instances that you want to configure.

modules/configuring/proc-mounting-additional-files-in-your-custom-configuration-using-rhdh-operator.adoc

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
:_mod-docs-content-type: PROCEDURE
12
[id="mounting-additional-files-in-your-custom-configuration-using-rhdh-operator"]
2-
= Mounting additional files in your custom configuration using the {product} Operator
3+
= Mounting additional files in your custom configuration by using the {product} Operator
34

45
You can use the {product-short} Operator to mount extra files, such as a ConfigMap or Secret, to the container in a preferred location.
56

6-
The `mountPath` field specifies the location where a ConfigMap or Secret is mounted. The behavior of the mount, whether it includes or excludes a `subPath`, depends on the specification of the `key` or `mountPath` fields.
7+
The `mountPath` field specifies the location where a ConfigMap or Secret is mounted.
8+
The behavior of the mount, whether it includes or excludes a `subPath`, depends on the specification of the `key` or `mountPath` fields.
79

810
* If `key` and `mountPath` are not specified: Each key or value is mounted as a `filename` or content with a `subPath`.
911
* If `key` is specified with or without `mountPath`: The specified key or value is mounted with a `subPath`.
@@ -15,17 +17,15 @@ The `mountPath` field specifies the location where a ConfigMap or Secret is moun
1517
* For security purposes, {product} does not give the Operator Service Account read access to Secrets. As a result, mounting files from Secrets without specifying both mountPath and key is not supported.
1618
====
1719

18-
1920
.Prerequisites
2021
* You have developer permissions to access the {ocp-short} cluster containing your {product-short} instance using the {openshift-cli}.
2122
* link:{installing-on-ocp-book-url}[Your {ocp-short} administrator has installed the {product} Operator in {ocp-short}].
2223
2324
.Procedure
24-
2525
. In {ocp-short}, create your ConfigMap or Secret with the following YAML codes:
2626
+
27-
.Minimal `{my-extra-file-configmap}` ConfigMap example
28-
====
27+
Minimal `{my-extra-file-configmap}` ConfigMap example:
28+
+
2929
[source,yaml,subs="+attributes,+quotes"]
3030
----
3131
apiVersion: v1
@@ -38,10 +38,9 @@ data:
3838
file 12.txt: |
3939
My file12 content
4040
----
41-
====
4241
+
43-
.Minimal {product} Secret example
44-
====
42+
Minimal {product} Secret example:
43+
+
4544
[source,yaml,subs="+attributes,+quotes"]
4645
----
4746
apiVersion: v1
@@ -52,12 +51,12 @@ StringData:
5251
secret11.txt: |
5352
secret-content
5453
----
55-
====
54+
+
5655
For more information, see xref:provisioning-your-custom-configuration[Provisioning and using your custom {product} configuration].
5756

58-
. Set the value of the `configMaps name` to the name of the ConfigMap or `secrets name` to the name of the Secret in your `{product-custom-resource-type}` CR. For example:
57+
. Set the value of the `configMaps name` to the name of the ConfigMap or `secrets name` to the name of the Secret in your `{product-custom-resource-type}` CR.
58+
For example:
5959
+
60-
====
6160
[source,yaml,subs="+attributes,+quotes"]
6261
----
6362
spec:
@@ -74,8 +73,7 @@ spec:
7473
mountPath: /my/my-rhdh-secret/path
7574

7675
----
77-
====
78-
76+
+
7977
[NOTE]
8078
====
8179
`_<my_product_secrets>_` is your preferred {product-short} secret name, specifying the identifier for your secret configuration within {product-short}.

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

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
:_mod-docs-content-type: PROCEDURE
12
[id="using-the-operator-to-run-rhdh-with-your-custom-configuration"]
23
= Using the {product} Operator to run {product-short} with your custom configuration
34

@@ -12,11 +13,10 @@ To use the {product-short} Operator to run {product} with your custom configurat
1213
* xref:provisioning-your-custom-configuration[You have provisioned your custom config maps and secrets in your `_<{my-product-namespace}>_` project].
1314
1415
.Procedure
15-
1616
. Author your {product-custom-resource-type} CR in a `{my-product-cr-name}.yaml` file to use your custom config maps and secrets.
1717
+
18-
.Minimal `{my-product-cr-name}.yaml` custom resource example
19-
====
18+
Minimal `{my-product-cr-name}.yaml` custom resource example:
19+
+
2020
[source,yaml,subs="+attributes,+quotes"]
2121
----
2222
apiVersion: rhdh.redhat.com/v1alpha3
@@ -39,10 +39,9 @@ spec:
3939
database:
4040
enableLocalDb: true
4141
----
42-
====
4342
+
44-
.`{my-product-cr-name}.yaml` custom resource example with dynamic plugins and RBAC policies config maps, and external PostgreSQL database secrets.
45-
====
43+
`{my-product-cr-name}.yaml` custom resource example with dynamic plugins and RBAC policies config maps, and external PostgreSQL database secrets:
44+
+
4645
[source,yaml,subs="+attributes,+quotes"]
4746
----
4847
apiVersion: rhdh.redhat.com/v1alpha3
@@ -71,21 +70,19 @@ spec:
7170
database:
7271
enableLocalDb: false
7372
----
74-
====
7573

7674
Mandatory fields::
7775

7876
No fields are mandatory.
79-
You can create an empty {product-custom-resource-type} CR
80-
and run {product-short} with the default configuration.
77+
You can create an empty {product-custom-resource-type} CR and run {product-short} with the default configuration.
8178

8279
Optional fields::
8380

8481
`spec.application.appConfig.configMaps`:::
8582
Enter your config map name list.
8683
+
87-
.Mount files in the `{my-app-config-config-map}` config map.
88-
====
84+
Mount files in the `{my-app-config-config-map}` config map:
85+
+
8986
[source,yaml,subs="+attributes,+quotes"]
9087
----
9188
spec:
@@ -95,10 +92,9 @@ spec:
9592
configMaps:
9693
- name: {my-app-config-config-map}
9794
----
98-
====
9995
+
100-
.Mount files in the `{my-app-config-config-map}` and `rbac-policies` config maps.
101-
====
96+
Mount files in the `{my-app-config-config-map}` and `rbac-policies` config maps:
97+
+
10298
[source,yaml,subs="+attributes,+quotes"]
10399
----
104100
spec:
@@ -109,13 +105,12 @@ spec:
109105
- name: {my-app-config-config-map}
110106
- name: rbac-policies
111107
----
112-
====
113108

114109
`spec.application.extraEnvs.envs`:::
115110
Optionally, enter your additional environment variables that are not secrets, such as xref:proc-configuring-proxy-in-operator-deployment_running-behind-a-proxy[your proxy environment variables].
116111
+
117-
.Inject your `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables.
118-
====
112+
Inject your `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables:
113+
+
119114
[source,yaml,subs="+attributes,+quotes"]
120115
----
121116
spec:
@@ -129,13 +124,12 @@ spec:
129124
- name: NO_PROXY
130125
value: 'localhost,example.org'
131126
----
132-
====
133127

134128
`spec.application.extraEnvs.secrets`:::
135129
Enter your environment variables secret name list.
136130
+
137-
.Inject the environment variables in your {product} secret
138-
====
131+
Inject the environment variables in your {product} secret:
132+
+
139133
[source,yaml,subs="+attributes,+quotes"]
140134
----
141135
spec:
@@ -144,10 +138,9 @@ spec:
144138
secrets:
145139
- name: _<my_product_secrets>_
146140
----
147-
====
148141
+
149-
.Inject the environment variables in the {product} and `{my-product-database-secrets}` secrets
150-
====
142+
Inject the environment variables in the {product} and `{my-product-database-secrets}` secrets:
143+
+
151144
[source,yaml,subs="+attributes,+quotes"]
152145
----
153146
spec:
@@ -157,8 +150,7 @@ spec:
157150
- name: _<my_product_secrets>_
158151
- name: {my-product-database-secrets}
159152
----
160-
====
161-
153+
+
162154
[NOTE]
163155
====
164156
`_<my_product_secrets>_` is your preferred {product-short} secret name, specifying the identifier for your secret configuration within {product-short}.
@@ -167,7 +159,8 @@ spec:
167159
`spec.application.extraFiles.secrets`:::
168160
Enter your certificates files secret name and files list.
169161
+
170-
.Mount the `postgres-crt.pem`, `postgres-ca.pem`, and `postgres-key.key` files contained in the `{my-product-database-certificates-secrets}` secret
162+
Mount the `postgres-crt.pem`, `postgres-ca.pem`, and `postgres-key.key` files contained in the `{my-product-database-certificates-secrets}` secret:
163+
+
171164
[source,yaml,subs="+attributes,+quotes"]
172165
----
173166
spec:
@@ -182,15 +175,17 @@ spec:
182175
`spec.database.enableLocalDb`:::
183176
Enable or disable the local PostgreSQL database.
184177
+
185-
.Disable the local PostgreSQL database generation to use an external postgreSQL database
178+
Disable the local PostgreSQL database generation to use an external postgreSQL database:
179+
+
186180
[source,yaml,subs="+attributes,+quotes"]
187181
----
188182
spec:
189183
database:
190184
enableLocalDb: false
191185
----
192186
+
193-
.On a development environment, use the local PostgreSQL database
187+
On a development environment, use the local PostgreSQL database:
188+
+
194189
[source,yaml,subs="+attributes,+quotes"]
195190
----
196191
spec:
@@ -200,8 +195,8 @@ spec:
200195

201196
`spec.deployment`:::
202197
Optionally, xref:configuring-the-deployment[enter your deployment configuration].
203-
204-
. Apply your {product-custom-resource-type} CR to start or update your {product-short} instance.
198+
+
199+
Apply your {product-custom-resource-type} CR to start or update your {product-short} instance:
205200
+
206201
[source,terminal,subs="+attributes,+quotes"]
207202
----

titles/configuring/master.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ include::assemblies/assembly-configuring-a-proxy.adoc[leveloffset=+1]
2727
include::modules/installation/proc-configuring-an-rhdh-instance-with-tls-in-kubernetes.adoc[leveloffset=+1]
2828

2929

30-
include::assemblies/dynamic-plugins/assembly-using-the-dynamic-plugins-cache.adoc[ leveloffset=+1]
30+
include::assemblies/dynamic-plugins/assembly-using-the-dynamic-plugins-cache.adoc[leveloffset=+1]
3131

3232

3333
include::assemblies/assembly-configuring-default-secret-pvc-mounts.adoc[leveloffset=+1]
3434

3535

36-
include::modules/configuring/proc-enabling-the-rhdh-plugin-assets-cache.adoc[leveloffset=+1]
36+
include::modules/configuring/proc-enabling-the-rhdh-plugin-assets-cache.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)