Skip to content

Commit 3a58864

Browse files
authored
Merge pull request #34152 from bergerhoffer/OSDOCS-1854-component-update
OSDOCS-1854: Updating control plane component list
2 parents a23e04d + 7c7fedf commit 3a58864

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

modules/tls-profiles-understanding.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
//
33
// * security/tls-security-profiles.adoc
44

5-
[id="tls-profiles-ingress-understanding_{context}"]
5+
[id="tls-profiles-understanding_{context}"]
66
= Understanding TLS security profiles
77

88
You can use a TLS (Transport Layer Security) security profile to define which TLS ciphers are required by various {product-title} components. The {product-title} TLS security profiles are based on link:https://wiki.mozilla.org/Security/Server_Side_TLS[Mozilla recommended configurations].
99

10-
You can specify one of the following TLS security profiles:
10+
You can specify one of the following TLS security profiles for each component:
1111

1212
.TLS security profiles
1313
[cols="1,2a",options="header"]
@@ -26,7 +26,7 @@ For the Ingress Controller, the minimum TLS version is converted from 1.0 to 1.1
2626
====
2727

2828
|`Intermediate`
29-
|This profile is the recommended configuration for the majority of clients. It is the default TLS security profile for the Ingress Controller, kubelet, and Kubernetes control plane. The profile is based on the link:https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29[Intermediate compatibility] recommended configuration.
29+
|This profile is the recommended configuration for the majority of clients. It is the default TLS security profile for the Ingress Controller, kubelet, and control plane. The profile is based on the link:https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29[Intermediate compatibility] recommended configuration.
3030

3131
The `Intermediate` profile requires a minimum TLS version of 1.2.
3232

@@ -52,7 +52,7 @@ Use caution when using a `Custom` profile, because invalid configurations can ca
5252

5353
[NOTE]
5454
====
55-
When using one of the predefined 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, resulting in a rollout.
55+
When using one of the predefined 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 might cause a new profile configuration to be applied, resulting in a rollout.
5656
====
5757

5858
// TODO: Make sure all this is captured somewhere as necessary

modules/tls-profiles-view-details.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="tls-profiles-view-details_{context}"]
66
= Viewing TLS security profile details
77

8-
You can view the minimum TLS version and ciphers for the predefined TLS security profiles for each of the following components: Ingress Controller, Kubernetes control plane, and kubelet.
8+
You can view the minimum TLS version and ciphers for the predefined TLS security profiles for each of the following components: Ingress Controller, control plane, and kubelet.
99

1010
[IMPORTANT]
1111
====
@@ -22,7 +22,7 @@ $ oc explain <component>.spec.tlsSecurityProfile.<profile> <1>
2222
----
2323
<1> For `<component>`, specify `ingresscontroller`, `apiserver`, or `kubeletconfig`. For `<profile>`, specify `old`, `intermediate`, or `custom`.
2424
+
25-
For example, to check the ciphers included for the `intermediate` profile for the Kubernetes control plane:
25+
For example, to check the ciphers included for the `intermediate` profile for the control plane:
2626
+
2727
[source,terminal]
2828
----

security/tls-security-profiles.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ TLS security profiles provide a way for servers to regulate which ciphers a conn
99

1010
Cluster administrators can choose which TLS security profile to use for each of the following components:
1111

12-
* the Ingress controller
13-
* the Kubernetes control plane (Kubernetes API server, Kubernetes controller manager, and Kubernetes scheduler)
12+
* the Ingress Controller
13+
* the control plane
14+
+
15+
This includes the Kubernetes API server, Kubernetes controller manager, Kubernetes scheduler, OpenShift API server, OpenShift OAuth API server, and OpenShift OAuth server.
16+
+
17+
// NOTE: etcd and OpenShift controller manager are not included
18+
1419
* the kubelet, when it acts as an HTTP server for the Kubernetes API server
1520
// TODO: add links once the procedures have been added?
1621

0 commit comments

Comments
 (0)