Skip to content

Commit abc37e5

Browse files
authored
Merge pull request #97596 from openshift-cherrypick-robot/cherry-pick-97430-to-enterprise-4.20
[enterprise-4.20] OSDOCS#15307: adds file name for CA bundle to ingress MicroShift
2 parents 1422332 + 863daba commit abc37e5

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

modules/microshift-ingress-controller-config.adoc

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
[id="microshift-ingress-control-config_{context}"]
88
= Configuring ingress control in {microshift-short}
99

10-
You can use detailed ingress control settings by updating the {microshift-short} service configuration file.
10+
You can use detailed ingress control settings by updating the {microshift-short} service configuration file or using a configuration snippet.
11+
12+
[IMPORTANT]
13+
====
14+
* A `config.yaml` configuration file takes precedence over built-in settings. The `config.yaml` file is read every time the {microshift-short} service starts.
15+
* Configuration snippet YAMLs take precedence over both built-in settings and the `config.yaml` configuration file.
16+
====
1117

1218
.Prerequisites
1319

@@ -20,18 +26,8 @@ You can use detailed ingress control settings by updating the {microshift-short}
2026
. Apply ingress control settings in one of the two following ways:
2127

2228
.. Update the {microshift-short} `config.yaml` configuration file by making a copy of the provided `config.yaml.default` file in the `/etc/microshift/` directory, naming it `config.yaml` and keeping it in the source directory.
23-
+
24-
[IMPORTANT]
25-
====
26-
After you create the `config.yaml`, the configuration file takes precedence over built-in settings. The `config.yaml` file is read every time the {microshift-short} service starts.
27-
====
2829

2930
.. Use a configuration snippet to apply the ingress control settings you want. To do this, create a configuration snippet YAML file and put it in the `/etc/microshift/config.d/` configuration directory.
30-
+
31-
[IMPORTANT]
32-
====
33-
Configuration snippet YAMLs take precedence over both built-in settings and the `config.yaml` configuration file.
34-
====
3531

3632
. Replace the default values in the `ingress` section of the {microshift-short} YAML with your valid values, or create a configuration snippet file with the sections you need.
3733
+
@@ -235,7 +231,7 @@ When configured, this field must contain a valid expression or the {microshift-s
235231
====
236232

237233
|`clientTLS.clientCA`
238-
|Specifies a required config map that is in the `openshift-ingress` namespace. Required to enable client TLS. The config map must contain a certificate authority (CA) bundle.
234+
|Specifies a required config map that is in the `openshift-ingress` namespace. Required to enable client TLS. The config map must contain a certificate authority (CA) bundle named `ca-bundle.pem` or the deployment of the default router fails.
239235

240236
|`clientTLS.clientCA.name`
241237
|The `metadata.name` of the config map referenced in the `clientTLS.clientCA` value.

0 commit comments

Comments
 (0)