Skip to content

Commit 3020cda

Browse files
authored
Merge pull request #60679 from aireilly/telcodocs-1321-update-reference-config
TELCODOCS-1321 - 4.13 vDU reference config updates
2 parents 68981e2 + 4b56be0 commit 3020cda

File tree

79 files changed

+1197
-858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1197
-858
lines changed

.vale/styles/Vocab/OpenShiftDocs/accept.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ custom resource
88
custom resources
99
MetalLB
1010
Operator
11-
Operators
11+
Operators
12+
[Ff]ronthaul
13+
[Mm]idhaul
14+
[Rr]ealtime

modules/ztp-deploying-a-site.adoc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ $ oc create namespace $CLUSTERNS
5151
+
5252
[NOTE]
5353
====
54-
The secrets are referenced from the `SiteConfig` custom resource (CR) by name. The namespace
55-
must match the `SiteConfig` namespace.
54+
The secrets are referenced from the `SiteConfig` custom resource (CR) by name. The namespace must match the `SiteConfig` namespace.
5655
====
5756

5857
. Create a `SiteConfig` CR for your cluster in your local clone of the Git repository:
@@ -66,7 +65,16 @@ The folder includes example files for single node, three-node, and standard clus
6665
6766
.. Change the cluster and host details in the example file to match the type of cluster you want. For example:
6867
+
69-
include::snippets/ztp-example-siteconfig.adoc[]
68+
.Example {sno} SiteConfig CR
69+
[source,yaml]
70+
----
71+
include::snippets/ztp_example-sno.yaml[]
72+
----
73+
+
74+
[NOTE]
75+
====
76+
For more information about BMC addressing, see the "Additional resources" section.
77+
====
7078
7179
.. You can inspect the default set of extra-manifest `MachineConfig` CRs in `out/argocd/extra-manifest`. It is automatically applied to the cluster when it is installed.
7280
@@ -77,7 +85,7 @@ include::snippets/ztp-example-siteconfig.adoc[]
7785
====
7886
For optimal cluster performance, enable crun for master and worker nodes in {sno}, {sno} with additional worker nodes, {3no}, and standard clusters.
7987
80-
Enable crun in a `ContainerRuntimeConfig` CR as an additional day-0 install-time manifest to avoid the cluster having to reboot.
88+
Enable crun in a `ContainerRuntimeConfig` CR as an additional Day 0 install-time manifest to avoid the cluster having to reboot.
8189
8290
The `enable-crun-master.yaml` and `enable-crun-worker.yaml` CR files are in the `out/source-crs/optional-extra-manifest/` folder that you can extract from the `ztp-site-generate` container.
8391
For more information, see "Customizing extra installation manifests in the {ztp} pipeline".

modules/ztp-du-cluster-config-reference.adoc

Lines changed: 0 additions & 92 deletions
This file was deleted.

modules/ztp-du-firmware-config-reference.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * scalability_and_performance/ztp_far_edge/ztp-vdu-validating-cluster-tuning.adoc
44

5-
:_module-type: REFERENCE
5+
:_content-type: REFERENCE
66
[id="ztp-du-firmware-config-reference_{context}"]
77
= Recommended firmware configuration for vDU cluster hosts
88

@@ -93,4 +93,4 @@ Enable global SR-IOV and VT-d settings in the firmware for the host. These setti
9393
[NOTE]
9494
====
9595
Enable both `C-states` and OS-controlled `P-States` to allow per pod power management.
96-
====
96+
====

modules/ztp-enabling-workload-partitioning-sno.adoc

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,27 @@
88

99
Workload partitioning configures {product-title} services, cluster management workloads, and infrastructure pods to run on a reserved number of host CPUs.
1010

11-
To configure workload partitioning with {ztp-first}, you specify cluster management CPU resources with the `cpuset` field of the `SiteConfig` custom resource (CR) and the `reserved` field of the group `PolicyGenTemplate` CR.
12-
The {ztp} pipeline uses these values to populate the required fields in the workload partitioning `MachineConfig` CR (`cpuset`) and the `PerformanceProfile` CR (`reserved`) that configure the {sno} cluster.
11+
To configure workload partitioning with {ztp-first}, you configure a `cpuPartitioningMode` field in the `SiteConfig` custom resource (CR) that you use to install the cluster and you apply a `PerformanceProfile` CR that configures the `isolated` and `reserved` CPUs on the host.
12+
13+
Configuring the `SiteConfig` CR enables workload partitioning at cluster installation time and applying the `PerformanceProfile` CR configures the specific allocation of CPUs to reserved and isolated sets.
14+
Both of these steps happen at different points during cluster provisioning.
1315

1416
[NOTE]
1517
====
16-
For maximum performance, ensure that the `reserved` and `isolated` CPU sets do not share CPU cores across NUMA zones.
18+
Configuring workload partitioning by using the `cpuPartitioningMode` field in the `SiteConfig` CR is a Tech Preview feature in {product-title} 4.13.
19+
20+
Alternatively, you can specify cluster management CPU resources with the `cpuset` field of the `SiteConfig` custom resource (CR) and the `reserved` field of the group `PolicyGenTemplate` CR.
21+
The {ztp} pipeline uses these values to populate the required fields in the workload partitioning `MachineConfig` CR (`cpuset`) and the `PerformanceProfile` CR (`reserved`) that configure the {sno} cluster.
22+
This method is a General Availability feature in {product-title} 4.14.
1723
====
1824

19-
* The workload partitioning `MachineConfig` CR pins the {product-title} infrastructure pods to a defined `cpuset` configuration.
20-
* The `PerformanceProfile` CR pins the systemd services to the reserved CPUs.
25+
The workload partitioning configuration pins the {product-title} infrastructure pods to the `reserved` CPU set.
26+
Platform services such as systemd, CRI-O, and kubelet run on the `reserved` CPU set.
27+
The `isolated` CPU sets are exclusively allocated to your container workloads.
28+
Isolating CPUs ensures that the workload has guaranteed access to the specified CPUs without contention from other applications running on the same node.
29+
All CPUs that are not isolated should be reserved.
2130

2231
[IMPORTANT]
2332
====
24-
The value for the `reserved` field specified in the `PerformanceProfile` CR must match the `cpuset` field in the workload partitioning `MachineConfig` CR.
33+
Ensure that `reserved` and `isolated` CPU sets do not overlap with each other.
2534
====

modules/ztp-generating-install-and-config-crs-manually.adoc

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,16 @@ $ mkdir -p ./site-install
6060

6161
. Modify the example `SiteConfig` CR for the cluster type that you want to install. Copy `example-sno.yaml` to `site-1-sno.yaml` and modify the CR to match the details of the site and bare-metal host that you want to install, for example:
6262
+
63-
include::snippets/ztp-example-siteconfig.adoc[]
63+
[source,yaml]
64+
----
65+
include::snippets/ztp_example-sno.yaml[]
66+
----
6467

65-
. Generate the day-0 installation CRs by processing the modified `SiteConfig` CR `site-1-sno.yaml` by running the following command:
68+
. Generate the Day 0 installation CRs by processing the modified `SiteConfig` CR `site-1-sno.yaml` by running the following command:
6669
+
6770
[source,terminal,subs="attributes+"]
6871
----
69-
$ podman run -it --rm -v `pwd`/out/argocd/example/siteconfig:/resources:Z -v `pwd`/site-install:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version}.1 generator install site-1-sno.yaml /output
72+
$ podman run -it --rm -v `pwd`/out/argocd/example/siteconfig:/resources:Z -v `pwd`/site-install:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version} generator install site-1-sno.yaml /output
7073
----
7174
+
7275
.Example output
@@ -88,7 +91,7 @@ site-install
8891
└── site-1-sno_nmstateconfig_example-node1.example.com.yaml
8992
----
9093

91-
. Optional: Generate just the day-0 `MachineConfig` installation CRs for a particular cluster type by processing the reference `SiteConfig` CR with the `-E` option. For example, run the following commands:
94+
. Optional: Generate just the Day 0 `MachineConfig` installation CRs for a particular cluster type by processing the reference `SiteConfig` CR with the `-E` option. For example, run the following commands:
9295

9396
.. Create an output folder for the `MachineConfig` CRs:
9497
+
@@ -101,7 +104,7 @@ $ mkdir -p ./site-machineconfig
101104
+
102105
[source,terminal,subs="attributes+"]
103106
----
104-
$ podman run -it --rm -v `pwd`/out/argocd/example/siteconfig:/resources:Z -v `pwd`/site-machineconfig:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version}.1 generator install -E site-1-sno.yaml /output
107+
$ podman run -it --rm -v `pwd`/out/argocd/example/siteconfig:/resources:Z -v `pwd`/site-machineconfig:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version} generator install -E site-1-sno.yaml /output
105108
----
106109
+
107110
.Example output
@@ -114,20 +117,20 @@ site-machineconfig
114117
└── site-1-sno_machineconfig_predefined-extra-manifests-worker.yaml
115118
----
116119

117-
. Generate and export the day-2 configuration CRs using the reference `PolicyGenTemplate` CRs from the previous step. Run the following commands:
120+
. Generate and export the Day 2 configuration CRs using the reference `PolicyGenTemplate` CRs from the previous step. Run the following commands:
118121

119-
.. Create an output folder for the day-2 CRs:
122+
.. Create an output folder for the Day 2 CRs:
120123
+
121124
[source,terminal]
122125
----
123126
$ mkdir -p ./ref
124127
----
125128

126-
.. Generate and export the day-2 configuration CRs:
129+
.. Generate and export the Day 2 configuration CRs:
127130
+
128131
[source,terminal,subs="attributes+"]
129132
----
130-
$ podman run -it --rm -v `pwd`/out/argocd/example/policygentemplates:/resources:Z -v `pwd`/ref:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version}.1 generator config -N . /output
133+
$ podman run -it --rm -v `pwd`/out/argocd/example/policygentemplates:/resources:Z -v `pwd`/ref:/output:Z,U registry.redhat.io/openshift4/ztp-site-generate-rhel8:v{product-version} generator config -N . /output
131134
----
132135
+
133136
The command generates example group and site-specific `PolicyGenTemplate` CRs for {sno}, three-node clusters, and standard clusters in the `./ref` folder.

modules/ztp-installation-crs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following table lists the installation CRs that are automatically applied by
2222

2323
|`BareMetalHost`
2424
|Contains the connection information for the Baseboard Management Controller (BMC) of the target bare-metal host.
25-
|Provides access to the BMC to load and start the discovery image on the target server. {ztp-first} supports iPXE and virtual media booting by using Redfish or IPMI protocols. To use iPXE booting, you must use {rh-rhacm} 2.8 or later.
25+
|Provides access to the BMC to load and start the discovery image on the target server by using the Redfish protocol.
2626

2727
|`InfraEnv`
2828
|Contains information for installing {product-title} on the target bare-metal host.

modules/ztp-precaching-booting-from-live-os.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * scalability_and_performance/ztp_far_edge/ztp-precaching-tool.adoc
44

5-
:_module-type: PROCEDURE
5+
:_content-type: PROCEDURE
66
[id="ztp-booting-from-live-os_{context}"]
77
= Booting from a live operating system image
88

@@ -61,4 +61,4 @@ $ curl --globoff -L -w "%{http_code} %{url_effective}\\n" -ku ${username_passwor
6161
$ curl --globoff -L -w "%{http_code} %{url_effective}\\n" -ku ${username_password} -H "Content-Type: application/json" -H "Accept: application/json" -d '{"Boot":{ "BootSourceOverrideEnabled": "Once", "BootSourceOverrideTarget": "Cd", "BootSourceOverrideMode": "UEFI"}}' -X PATCH https://$BMC_ADDRESS/redfish/v1/Systems/Self
6262
----
6363

64-
. Reboot and ensure that the server is booting from virtual media.
64+
. Reboot and ensure that the server is booting from virtual media.

modules/ztp-precaching-getting-tool.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * scalability_and_performance/ztp_far_edge/ztp-precaching-tool.adoc
44

5-
:_module-type: PROCEDURE
5+
:_content-type: PROCEDURE
66
[id="ztp-getting-tool_{context}"]
77
= Getting the {factory-prestaging-tool}
88

@@ -33,4 +33,4 @@ If you are working in a disconnected environment or have a private registry, you
3333
[source,terminal]
3434
----
3535
factory-precaching-cli version 20221018.120852+main.feecf17
36-
----
36+
----

modules/ztp-precaching-troubleshooting.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * scalability_and_performance/ztp_far_edge/ztp-precaching-tool.adoc
44

5-
:_module-type: PROCEDURE
5+
:_content-type: PROCEDURE
66
[id="ztp-pre-staging-troubleshooting_{context}"]
77
= Troubleshooting
88

@@ -44,7 +44,7 @@ error: error rendering new refs: render reference "eko4.cloud.lab.eng.bos.redhat
4444
# cp /tmp/eko4-ca.crt /etc/pki/ca-trust/source/anchors/.
4545
----
4646

47-
. Update the certificates trust store:
47+
. Update the certificates truststore:
4848
+
4949
[source,terminal]
5050
----
@@ -59,4 +59,4 @@ error: error rendering new refs: render reference "eko4.cloud.lab.eng.bos.redhat
5959
factory-precaching-cli download -r 4.11.5 --acm-version 2.5.4 \
6060
--mce-version 2.0.4 -f /mnt \--img quay.io/custom/repository
6161
--du-profile -s --skip-imageset
62-
----
62+
----

0 commit comments

Comments
 (0)