Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions modules/microshift-ingress-controller-config.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
[id="microshift-ingress-control-config_{context}"]
= Configuring ingress control in {microshift-short}

You can use detailed ingress control settings by updating the {microshift-short} service configuration file.
You can use detailed ingress control settings by updating the {microshift-short} service configuration file or using a configuration snippet.

[IMPORTANT]
====
* A `config.yaml` configuration file takes precedence over built-in settings. The `config.yaml` file is read every time the {microshift-short} service starts.
* Configuration snippet YAMLs take precedence over both built-in settings and the `config.yaml` configuration file.
====

.Prerequisites

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

.. 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.
+
[IMPORTANT]
====
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.
====

.. 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.
+
[IMPORTANT]
====
Configuration snippet YAMLs take precedence over both built-in settings and the `config.yaml` configuration file.
====

. 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.
+
Expand Down Expand Up @@ -235,7 +231,7 @@ When configured, this field must contain a valid expression or the {microshift-s
====

|`clientTLS.clientCA`
|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.
|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.

|`clientTLS.clientCA.name`
|The `metadata.name` of the config map referenced in the `clientTLS.clientCA` value.
Expand Down