Skip to content

Commit c7de1e0

Browse files
bburt-rhbburt-rh
authored
Merge pull request #60744 from rh-tokeefe/OSSM-4041
OSSM-4041: Update infrastructure node content
2 parents 8894df2 + dac8fdd commit c7de1e0

6 files changed

+181
-11
lines changed

‎modules/ossm-about-control-plane-components-and-infrastructure-nodes.adoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Module included in the following assemblies:
2+
// * service_mesh/v2x/ossm-create-smcp.adoc
3+
4+
:_content-type: CONCEPT
5+
[id="ossm-about-control-plane-components-and-infrastructure-nodes_{context}"]
6+
= About control plane components and infrastructure nodes
7+
8+
Infrastructure nodes provide a way to isolate infrastructure workloads for two primary purposes:
9+
10+
* To prevent incurring billing costs against subscription counts
11+
* To separate maintenance and management of infrastructure workloads
12+
13+
You can configure some or all of the {SMProductShortName} control plane components to run on infrastructure nodes.

‎modules/ossm-config-control-plane-infrastructure-node.adoc renamed to ‎modules/ossm-config-control-plane-infrastructure-node-cli.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
// * service_mesh/v2x/ossm-deployment-models.adoc
44

55
:_content-type: PROCEDURE
6-
[id="ossm-config-control-plane-infrastructure-node_{context}"]
7-
= Configuring all {SMProductShortName} control plane components to run on infrastructure nodes
6+
[id="ossm-config-control-plane-infrastructure-node-cli_{context}"]
7+
= Configuring all control plane components to run on infrastructure nodes using the CLI
88

9-
This task should only be performed if all of the components deployed by the {SMProductShortName} control plane (including Istiod, Ingress Gateway, and Egress Gateway) along with optional elements (such as Prometheus, Grafana, and Distributed Tracing) are running on infrastructure nodes.
9+
Perform this task if all of the components deployed by the {SMProductShortName} control plane will run on infrastructure nodes. These deployed components include Istiod, Ingress Gateway, and Egress Gateway, and optional applications such as Prometheus, Grafana, and Distributed Tracing.
1010

11-
If the control plane runs on a worker node, skip this task.
11+
If the control plane will run on a worker node, skip this task.
12+
13+
.Prerequisites
14+
15+
* You have installed the {SMProductName} Operator.
16+
* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
1217
1318
.Procedure
1419

‎modules/ossm-config-control-plane-infrastructure-node-console.adoc

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * service_mesh/v2x/ossm-deployment-models.adoc
4+
5+
:_content-type: PROCEDURE
6+
[id="ossm-config-control-plane-infrastructure-node-console_{context}"]
7+
= Configuring all control plane components to run on infrastructure nodes using the web console
8+
9+
Perform this task if all of the components deployed by the {SMProductShortName} control plane will run on infrastructure nodes. These deployed components include Istiod, Ingress Gateway, and Egress Gateway, and optional applications such as Prometheus, Grafana, and Distributed Tracing.
10+
11+
If the control plane will run on a worker node, skip this task.
12+
13+
.Prerequisites
14+
15+
* You have installed the {SMProductName} Operator.
16+
* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
17+
18+
.Procedure
19+
20+
. Log in to the {product-title} web console.
21+
22+
. Navigate to *Operators* -> *Installed Operators*.
23+
24+
. Click the {SMProductName} Operator, and then click *Istio Service Mesh Control Plane*.
25+
26+
. Click the name of the control plane resource. For example, `basic`.
27+
28+
. Click *YAML*.
29+
30+
. Add the `nodeSelector` and `tolerations` fields to the `spec.runtime.defaults.pod` specification in the `ServiceMeshControlPlane` resource, as shown in the following example:
31+
+
32+
[source,yaml]
33+
----
34+
spec:
35+
runtime:
36+
defaults:
37+
pod:
38+
nodeSelector: <1>
39+
node-role.kubernetes.io/infra: ""
40+
tolerations: <2>
41+
- effect: NoSchedule
42+
key: node-role.kubernetes.io/infra
43+
value: reserved
44+
- effect: NoExecute
45+
key: node-role.kubernetes.io/infra
46+
value: reserved
47+
----
48+
<1> Ensures that the `ServiceMeshControlPlane` pod is only scheduled on an infrastructure node.
49+
<2> Ensures that the pod is accepted by the infrastructure node for execution.
50+
51+
. Click *Save*.
52+
53+
. Click *Reload*.

‎modules/ossm-config-individual-control-plane-infrastructure-node.adoc renamed to ‎modules/ossm-config-individual-control-plane-infrastructure-node-cli.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
// * service_mesh/v2x/ossm-deployment-models.adoc
44

55
:_content-type: PROCEDURE
6-
[id="ossm-config-individual-control-plane-infrastructure-node_{context}"]
7-
= Configuring individual {SMProductShortName} control plane components to run on infrastructure nodes
6+
[id="ossm-config-individual-control-plane-infrastructure-node-cli_{context}"]
7+
= Configuring individual control plane components to run on infrastructure nodes using the CLI
88

9-
This task should only be performed if individual {SMProductShortName} control plane components (such as Istiod, the Ingress Gateway, and the Egress Gateway) will run on infrastructure nodes.
9+
Perform this task if individual components deployed by the {SMProductShortName} control plane will run on infrastructure nodes. These deployed components include Istiod, the Ingress Gateway, and the Egress Gateway.
1010

1111
If the control plane will run on a worker node, skip this task.
1212

13+
.Prerequisites
14+
15+
* You have installed the {SMProductName} Operator.
16+
* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
17+
1318
.Procedure
1419

1520
. Open the `ServiceMeshControlPlane` resource as a YAML file.
@@ -39,7 +44,7 @@ spec:
3944
key: node-role.kubernetes.io/infra
4045
value: reserved
4146
----
42-
<1> Ensures that the Istiod pod is only scheduled on an infrastructure node.
47+
<1> Ensures that the `Istiod` pod is only scheduled on an infrastructure node.
4348
<2> Ensures that the pod is accepted by the infrastructure node.
4449

4550
. To run Ingress and Egress Gateways on infrastructure nodes, add the `nodeSelector` and the `tolerations` fields to the `spec.gateways.ingress.runtime.pod` spec and the `spec.gateways.egress.runtime.pod` spec in the `ServiceMeshControlPlane` resource.

‎modules/ossm-config-individual-control-plane-infrastructure-node-console.adoc

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * service_mesh/v2x/ossm-deployment-models.adoc
4+
5+
:_content-type: PROCEDURE
6+
[id="ossm-config-individual-control-plane-infrastructure-node-console_{context}"]
7+
= Configuring individual control plane components to run on infrastructure nodes using the web console
8+
9+
Perform this task if individual components deployed by the {SMProductShortName} control plane will run on infrastructure nodes. These deployed components include Istiod, the Ingress Gateway, and the Egress Gateway.
10+
11+
If the control plane will run on a worker node, skip this task.
12+
13+
.Prerequisites
14+
15+
* You have installed the {SMProductName} Operator.
16+
* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
17+
18+
.Procedure
19+
20+
. Log in to the {product-title} web console.
21+
22+
. Navigate to *Operators* -> *Installed Operators*.
23+
24+
. Click the {SMProductName} Operator, and then click *Istio Service Mesh Control Plane*.
25+
26+
. Click the name of the control plane resource. For example, `basic`.
27+
28+
. Click *YAML*.
29+
30+
. Add the `nodeSelector` and `tolerations` fields to the `spec.runtime.components.pilot.pod` specification in the `ServiceMeshControlPlane` resource, as shown in the following example:
31+
+
32+
[source,yaml]
33+
----
34+
spec:
35+
runtime:
36+
components:
37+
pilot:
38+
pod:
39+
nodeSelector: <1>
40+
node-role.kubernetes.io/infra: ""
41+
tolerations: <2>
42+
- effect: NoSchedule
43+
key: node-role.kubernetes.io/infra
44+
value: reserved
45+
- effect: NoExecute
46+
key: node-role.kubernetes.io/infra
47+
value: reserved
48+
----
49+
<1> Ensures that the `Istiod` pod is only scheduled on an infrastructure node.
50+
<2> Ensures that the pod is accepted by the infrastructure node for execution.
51+
52+
. Add the `nodeSelector` and the `tolerations` fields to the `spec.gateways.ingress.runtime.pod` and `spec.gateways.egress.runtime.pod` specifications in the `ServiceMeshControlPlane` resource, as shown in the following example:
53+
+
54+
[source,yaml]
55+
----
56+
spec:
57+
gateways:
58+
ingress:
59+
runtime:
60+
pod:
61+
nodeSelector: <1>
62+
node-role.kubernetes.io/infra: ""
63+
tolerations: <2>
64+
- effect: NoSchedule
65+
key: node-role.kubernetes.io/infra
66+
value: reserved
67+
- effect: NoExecute
68+
key: node-role.kubernetes.io/infra
69+
value: reserved
70+
egress:
71+
runtime:
72+
pod:
73+
nodeSelector: <1>
74+
node-role.kubernetes.io/infra: ""
75+
tolerations: <2>
76+
- effect: NoSchedule
77+
key: node-role.kubernetes.io/infra
78+
value: reserved
79+
- effect: NoExecute
80+
key: node-role.kubernetes.io/infra
81+
value: reserved
82+
----
83+
<1> Ensures that the gateway pod is only scheduled on an infrastructure node
84+
<2> Ensures that the pod is accepted by the infrastructure node for execution.
85+
86+
. Click *Save*.
87+
88+
. Click *Reload*.

‎service_mesh/v2x/ossm-create-smcp.adoc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@ include::modules/ossm-control-plane-cli.adoc[leveloffset=+2]
1414

1515
include::modules/ossm-validate-smcp-cli.adoc[leveloffset=+2]
1616

17-
include::modules/ossm-config-control-plane-infrastructure-node.adoc[leveloffset=+1]
17+
include::modules/ossm-about-control-plane-components-and-infrastructure-nodes.adoc[leveloffset=+1]
1818

19-
include::modules/ossm-config-individual-control-plane-infrastructure-node.adoc[leveloffset=+1]
19+
include::modules/ossm-config-control-plane-infrastructure-node-console.adoc[leveloffset=+2]
2020

21-
include::modules/ossm-confirm-smcp-infrastructure-node.adoc[leveloffset=+1]
21+
include::modules/ossm-config-individual-control-plane-infrastructure-node-console.adoc[leveloffset=+2]
22+
23+
include::modules/ossm-config-control-plane-infrastructure-node-cli.adoc[leveloffset=+2]
24+
25+
include::modules/ossm-config-individual-control-plane-infrastructure-node-cli.adoc[leveloffset=+2]
26+
27+
include::modules/ossm-confirm-smcp-infrastructure-node.adoc[leveloffset=+2]
2228

2329
include::modules/ossm-about-control-plane-and-cluster-wide-deployment.adoc[leveloffset=+1]
2430

0 commit comments

Comments
 (0)