Skip to content

Commit f6d1b3a

Browse files
authored
Merge pull request #55912 from Amrita42/OSDOCS-6964
OCPBUGS-6964: SME feedback on yaml file
2 parents fbba9e7 + 47951c6 commit f6d1b3a

File tree

1 file changed

+24
-39
lines changed

1 file changed

+24
-39
lines changed

modules/installation-bare-metal-agent-installer-config-yaml.adoc

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,68 +14,53 @@ You can customize the `install-config.yaml` file to specify more details about y
1414
apiVersion: v1
1515
baseDomain: example.com <1>
1616
compute: <2>
17-
- hyperthreading: Enabled <3>
18-
name: worker
19-
replicas: 0 <4>
17+
- name: worker
18+
replicas: 0 <3>
2019
controlPlane: <2>
21-
hyperthreading: Enabled <3>
2220
name: master
23-
replicas: 1 <5>
21+
replicas: 1 <4>
2422
metadata:
25-
name: sno-cluster <6>
23+
name: sno-cluster <5>
2624
networking:
2725
clusterNetwork:
28-
- cidr: 10.128.0.0/14 <7>
29-
hostPrefix: 23 <8>
30-
networkType: OpenShiftSDN <9>
31-
serviceNetwork: <10>
26+
- cidr: 10.128.0.0/14 <6>
27+
hostPrefix: 23 <7>
28+
networkType: OpenShiftSDN <8>
29+
serviceNetwork: <9>
3230
- 172.30.0.0/16
3331
platform:
34-
none: {} <11>
35-
fips: false <12>
36-
pullSecret: '{"auths": ...}' <13>
37-
sshKey: 'ssh-ed25519 AAAA...' <14>
32+
none: {} <10>
33+
fips: false <11>
34+
pullSecret: '{"auths": ...}' <12>
35+
sshKey: 'ssh-ed25519 AAAA...' <13>
3836
----
3937
<1> The base domain of the cluster. All DNS records must be sub-domains of this base and include the cluster name.
4038
<2> The `controlPlane` section is a single mapping, but the `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Only one control plane pool is used.
41-
<3> Specifies whether to enable or disable simultaneous multithreading (SMT), or hyperthreading. By default, SMT is enabled to increase the performance of the cores in your machines. You can disable it by setting the parameter value to `Disabled`. If you disable SMT, you must disable it in all cluster machines; this includes both control plane and compute machines.
42-
43-
+
44-
[NOTE]
45-
====
46-
Simultaneous multithreading (SMT) is enabled by default. If SMT is not enabled in your BIOS settings, the `hyperthreading` parameter has no effect.
47-
====
48-
+
49-
[IMPORTANT]
50-
====
51-
If you disable `hyperthreading`, whether in the BIOS or in the `install-config.yaml` file, ensure that your capacity planning accounts for the dramatically decreased machine performance.
52-
====
53-
54-
<4> This parameter controls the number of compute machines that the Agent-based installation waits to discover before triggering the installation process. It is the number of compute machines that must be booted with the generated ISO.
39+
<3> This parameter controls the number of compute machines that the Agent-based installation waits to discover before triggering the installation process. It is the number of compute machines that must be booted with the generated ISO.
5540

5641
+
5742
[NOTE]
5843
====
5944
If you are installing a three-node cluster, do not deploy any compute machines when you install the {op-system-first} machines.
6045
====
6146
+
62-
<5> The number of control plane machines that you add to the cluster. Because the cluster uses these values as the number of etcd endpoints in the cluster, the value must match the number of control plane machines that you deploy.
63-
<6> The cluster name that you specified in your DNS records.
64-
<7> A block of IP addresses from which pod IP addresses are allocated. This block must not overlap with existing physical networks. These IP addresses are used for the pod network. If you need to access the pods from an external network, you must configure load balancers and routers to manage the traffic.
47+
<4> The number of control plane machines that you add to the cluster. Because the cluster uses these values as the number of etcd endpoints in the cluster, the value must match the number of control plane machines that you deploy.
48+
<5> The cluster name that you specified in your DNS records.
49+
<6> A block of IP addresses from which pod IP addresses are allocated. This block must not overlap with existing physical networks. These IP addresses are used for the pod network. If you need to access the pods from an external network, you must configure load balancers and routers to manage the traffic.
6550
+
6651
[NOTE]
6752
====
6853
Class E CIDR range is reserved for a future use. To use the Class E CIDR range, you must ensure your networking environment accepts the IP addresses within the Class E CIDR range.
6954
====
7055
+
71-
<8> The subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23`, then each node is assigned a `/23` subnet out of the given `cidr`, which allows for 510 (2^(32 - 23) - 2) pod IP addresses. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.
72-
<9> The cluster network plugin to install. The supported values are `OVNKubernetes` (default value) and `OpenShiftSDN`.
73-
<10> The IP address pool to use for service IP addresses. You can enter only one IP address pool. This block must not overlap with existing physical networks. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.
74-
<11> You must set the platform to `none` for a single-node cluster. You can also set the platform to `vSphere` and `baremetal`.
56+
<7> The subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23`, then each node is assigned a `/23` subnet out of the given `cidr`, which allows for 510 (2^(32 - 23) - 2) pod IP addresses. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.
57+
<8> The cluster network plugin to install. The supported values are `OVNKubernetes` (default value) and `OpenShiftSDN`.
58+
<9> The IP address pool to use for service IP addresses. You can enter only one IP address pool. This block must not overlap with existing physical networks. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.
59+
<10> You must set the platform to `none` for a single-node cluster. You can set the platform to either `vsphere` or `baremetal` for multi-node clusters.
7560
+
7661
[NOTE]
7762
====
78-
If you set the platform to `vSphere` or `baremetal`, you can configure IP address endpoints for cluster nodes in three ways:
63+
If you set the platform to `vsphere` or `baremetal`, you can configure IP address endpoints for cluster nodes in three ways:
7964

8065
* IPv4
8166
* IPv6
@@ -107,15 +92,15 @@ platform:
10792
- 2001:DB8::5
10893
----
10994
====
110-
<12> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
95+
<11> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
11196
+
11297
[IMPORTANT]
11398
====
11499
The use of FIPS Validated / Modules in Process cryptographic libraries is only supported on {product-title} deployments on the `x86_64` architecture.
115100
====
116101

117-
<13> This pull secret allows you to authenticate with the services that are provided by the included authorities, including Quay.io, which serves the container images for {product-title} components.
118-
<14> The SSH public key for the `core` user in {op-system-first}.
102+
<12> This pull secret allows you to authenticate with the services that are provided by the included authorities, including Quay.io, which serves the container images for {product-title} components.
103+
<13> The SSH public key for the `core` user in {op-system-first}.
119104
+
120105
[NOTE]
121106
====

0 commit comments

Comments
 (0)