Skip to content

Commit 33a03c4

Browse files
2.2 AAP-1505 Update docs for using custom SSL certificates in OCP (#569)
* AAP 1505--Update docs for using custom SSL certificates in OCP (#554) * ough draft of new content for section 3.2 * New files for AAP-4135 AAP Air Gapped installation * Files renamed for consistency and new content added to update to the current AAP version of the TLS configuration for AAP-1505. * AAP-1505 saved files. * Editing changes from peer review. * Completed peer review comments. * AAP-1505 Fix build error (#568) aap-1505 Fix build error Co-authored-by: rogrange <[email protected]>
1 parent 0d69f73 commit 33a03c4

7 files changed

+140
-7
lines changed

downstream/assemblies/platform/assembly-installing-controller-operator.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ When an instance of {ControllerName} is removed, the associated PVCs are not aut
3636

3737
You can proceed with configuring the instance using either the Form View or YAML view.
3838

39-
include::platform/proc-controller-route-options.adoc[leveloffset=+2]
39+
40+
include::platform/proc-creating-controller-form-view.adoc[leveloffset=+2]
41+
include::platform/proc-configuring-controller-image-pull-policy.adoc[leveloffset=+2]
42+
include::platform/proc-configuring-controller-ldap-security.adoc[leveloffset=+2]
43+
include::platform/proc-configuring-controller-route-options.adoc[leveloffset=+2]
4044
include::platform/proc-hub-ingress-options.adoc[leveloffset=+2]
4145

4246
Once you have configured your {ControllerName} operator, click *Create* at the bottom of the form view. {OCP} will now create the pods. This may take a few minutes.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[id="proc-configuring-controller-image-pull-policy_{context}"]
2+
3+
= Configuring your controller image pull policy
4+
5+
6+
. Under *Image Pull Policy*, click on the radio button to select
7+
* *Always*
8+
* *Never*
9+
* *IfNotPresent*
10+
. To display the option under *Image Pull Secrets*, click the arrow.
11+
.. Click *+* beside *Add Image Pull Secret* and enter a value.
12+
. To display fields under the *Web container resource requirements* drop-down list, click the arrow.
13+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
14+
. To display fields under the *Task container resource requirements* drop-down list, click the arrow.
15+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
16+
. To display fields under the *EE Control Plane container resource requirements* drop-down list, click the arrow.
17+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
18+
. To display fields under the *PostgreSQL init container resource requirements (when using a managed service)* drop-down list, click the arrow.
19+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
20+
. To display fields under the *Redis container resource requirements* drop-down list, click the arrow.
21+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
22+
. To display fields under the *PostgreSQL container resource requirements (when using a managed instance)** drop-down list, click the arrow.
23+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
24+
. To display the *PostgreSQL container storage requirements (when using a managed instance)* drop-down list, click the arrow.
25+
.. Under *Limits*, and *Requests*, enter values for *CPU cores*, *Memory*, and *Storage*.
26+
. Under Replicas, enter the number of instance replicas.
27+
. Under *Remove used secrets on instance removal*, select *true* or *false*. The default is false.
28+
. Under *Preload instance with data upon creation*, select *true* or *false*. The default is true.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[id="proc_configuring-controller-ldap-security_{context}"]
2+
3+
= Configuring your controller LDAP security
4+
5+
6+
. Under *LDAP Certificate Authority Trust Bundle* click the drop-down menu and select a secret.
7+
. Under *LDAP Password Secret*, click the drop-down menu and select a secret.
8+
. Under *EE Images Pull Credentials Secret*, click the drop-down menu and select a secret.
9+
. Under *Bundle Cacert Secret*, click the drop-down menu and select a secret.
10+
. Under *Service Type*, click the drop-down menu and select
11+
* *ClusterIP*
12+
* *LoadBalancer*
13+
* *NodePort*
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
[id="proc-controller-route-options_{context}"]
1+
[id="proc-configuring-controller-route-options_{context}"]
22

3-
= Configure your {ControllerName} operator route options
3+
= Configuring your {ControllerName} operator route options
44

55
The {PlatformName} operator installation form allows you to further configure your {ControllerName} operator route options under *Advanced configuration*.
66

77
. Click *Advanced configuration*.
88
. Under *Ingress type*, click the drop-down menu and select *Route*.
99
. Under *Route DNS host*, enter a common host name that the route answers to.
10-
. Under *Route TLS termination mechanism*, click the drop-down menu and select *Edge* or *Passthrough*.
10+
. Under *Route TLS termination mechanism*, click the drop-down menu and select *Edge* or *Passthrough*. For most instances *Edge* should be selected.
1111
. Under *Route TLS credential secret*, click the drop-down menu and select a secret from the list.
12+
. Under *Enable persistence for __/var/lib/projects__ directory* select either true or false by moving the slider.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[id="proc_creating-controller-form-view_{context}"]
2+
3+
= Creating your {ControllerName} form-view
4+
5+
6+
. Ensure *Form view* is selected. It should be selected by default.
7+
. Enter the name of the new controller.
8+
. Optional: Add any labels necessary.
9+
. Click *Advanced configuration*.
10+
. Enter *Hostname* of the instance. The hostname is optional. The default hostname will be generated based upon the deployment name you have selected.
11+
. Enter the *Admin account username*.
12+
. Enter the *Admin email address*.
13+
. Under the *Admin password secret* drop-down menu, select the secret.
14+
. Under *Database configuration secret* drop-down menu, select the secret.
15+
. Under *Old Database configuration secret* drop-down menu, select the secret.
16+
. Under *Secret key secret* drop-down menu, select the secret.
17+
. Under *Broadcast Websocket Secret* drop-down menu, select the secret.
18+
. Enter any *Service Account Annotations* necessary.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[id="proc-hub-ingress-options_{context}"]
22

3-
= Configure the Ingress type for your {HubName} operator
3+
= Configuring the Ingress type for your {ControllerName} operator
44

5-
The {PlatformName} operator installation form allows you to further configure your {HubName} operator Ingress under *Advanced configuration*.
5+
The {PlatformName} operator installation form allows you to further configure your {ControllerName} operator Ingress under *Advanced configuration*.
66

77
. Click *Advanced Configuration*.
88
. Under *Ingress type*, click the drop-down menu and select *Ingress*.
99
. Under *Ingress annotations*, enter any annotations to add to the ingress.
10-
. Under *Ingress TLS secret*, click the drop-down menu and select a secret from the list.
10+
. Under *Ingress TLS secret*, click the drop-down menu and select a secret from the list.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
////
2+
Base the file name and the ID on the module title. For example:
3+
* file name: proc-doing-procedure-a.adoc
4+
* ID: [id="proc-doing-procedure-a_{context}"]
5+
* Title: = Doing procedure A
6+
7+
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken. The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID even if it is reused multiple times in an assembly file.
8+
9+
Indicate the module type in one of the following
10+
ways:
11+
Add the prefix proc- or proc_ to the file name.
12+
Add the following attribute before the module ID:
13+
////
14+
:_content-type: PROCEDURE
15+
16+
[id="proc_configuring-tls-with-aap-operator_{context}"]
17+
= configuring-tls-with-aap-operator
18+
////
19+
Start the title of a procedure module with a gerund, such as Creating, Installing, or Deploying.
20+
////
21+
22+
Write a short introductory paragraph that provides an overview of the module. The introduction should include what the module will help the user do and why it will be beneficial to the user. Include key words that relate to the module to maximize search engine optimization.
23+
24+
.Prerequisites
25+
26+
* A bulleted list of conditions that must be satisfied before the user starts the steps in this module.
27+
* Prerequisites can be full sentences or sentence fragments; however, prerequisite list items must be parallel.
28+
29+
////
30+
If you have only one prerequisite, list it as a single bullet point.
31+
Do not write prerequisites in the imperative.
32+
You can include links to more information about the prerequisites.
33+
Delete the .Prerequisites section title and bullets if the module has no prerequisites.
34+
////
35+
36+
.Procedure
37+
38+
. Make each step an instruction.
39+
40+
. Include one command or action for each step with the exception of simple follow-step, for example:
41+
.. Do this thing and then select *Next*.
42+
.. Do this other thing and then select *Next*.
43+
44+
. Use an unnumbered bullet (*) if the procedure includes only one step.
45+
46+
.Verification
47+
////
48+
Delete this section if it does not apply to your module. Provide the user with verification methods for the procedure, such as expected output or commands that confirm success or failure.
49+
////
50+
51+
. Provide an example of expected command output or a pop-up window that the user receives when the procedure is successful.
52+
53+
. List actions for the user to complete, such as entering a command, to determine the success or failure of the procedure.
54+
55+
. Make each step an instruction.
56+
57+
. Include one command or action per step.
58+
59+
. Use an unnumbered bullet (*) if the verification includes only one step.
60+
61+
[role="_additional-resources"]
62+
.Additional resources
63+
////
64+
Optional. Delete if not used.
65+
////
66+
* A bulleted list of links to other closely-related material. These links can include `link:` and `xref:` macros.
67+
* For more details on writing procedure modules, see the link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
68+
* Use a consistent system for file names, IDs, and titles. For tips, see _Anchor Names and File Names_ in link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
69+

0 commit comments

Comments
 (0)