Skip to content

Commit 181a7f1

Browse files
committed
OSDOCS-1837: Remove admonition that TLS 1.3 and config are not supported in Ingress
1 parent 7b46ab4 commit 181a7f1

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

modules/nw-ingress-controller-configuration-parameters.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,18 @@ If not set, the default value is based on the `apiservers.config.openshift.io/cl
9292

9393
When using the `Old`, `Intermediate`, and `Modern` profile types, the effective profile configuration is subject to change between releases. For example, given a specification to use the `Intermediate` profile deployed on release `X.Y.Z`, an upgrade to release `X.Y.Z+1` may cause a new profile configuration to be applied to the Ingress Controller, resulting in a rollout.
9494

95-
The minimum TLS version for Ingress Controllers is `1.1`, and the maximum TLS version is `1.2`.
95+
The minimum TLS version for Ingress Controllers is `1.1`, and the maximum TLS version is `1.3`.
9696

97-
[IMPORTANT]
97+
[NOTE]
9898
====
99-
The HAProxy Ingress Controller image does not support TLS `1.3` and because the `Modern` profile requires TLS `1.3`, it is not supported. The Ingress Operator converts the `Modern` profile to `Intermediate`.
100-
101-
The Ingress Operator also converts the TLS `1.0` of an `Old` or `Custom` profile to `1.1`, and TLS `1.3` of a `Custom` profile to `1.2`.
99+
Ciphers and the minimum TLS version of the configured security profile are reflected in the `TLSProfile` status.
102100
====
103101

104-
[NOTE]
102+
[IMPORTANT]
105103
====
106-
Ciphers and the minimum TLS version of the configured security profile are reflected in the `TLSProfile` status.
104+
The Ingress Controller supports using TLS `1.3` and the `Modern` profile in HAProxy.
105+
106+
The Ingress Operator also converts the TLS `1.0` of an `Old` or `Custom` profile to `1.1`.
107107
====
108108

109109
|`routeAdmission`

modules/tls-profiles-understanding.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ The `Intermediate` profile requires a minimum TLS version of 1.2.
3535

3636
The `Modern` profile requires a minimum TLS version of 1.3.
3737

38-
[IMPORTANT]
39-
====
40-
The `Modern` profile is currently not supported.
41-
====
42-
4338
|`Custom`
4439
|This profile allows you to define the TLS version and ciphers to use.
4540

0 commit comments

Comments
 (0)