Skip to content

Commit 598fe98

Browse files
authored
Merge pull request #71543 from aireilly/TELCODOCS-1655
TELCODOCS-1655 - Update set of `MachineConfig` CRs for telco ZTP
2 parents 7b74178 + 946d0f8 commit 598fe98

File tree

3 files changed

+34
-15
lines changed

3 files changed

+34
-15
lines changed

.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ MetalLB
2626
NICs?
2727
pmc
2828
ubxtool
29+
vDUs?
2930
VFs?
3031
Westport
3132
PPC

modules/ztp-recommended-cluster-mc-crs.adoc

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,11 @@ a|`01-container-mount-ns-and-kubelet-conf-master.yaml`
2121
`01-container-mount-ns-and-kubelet-conf-worker.yaml`
2222
|Configures the container mount namespace and kubelet configuration.
2323

24-
|`02-workload-partitioning.yaml`
25-
a|Configures workload partitioning for the cluster. Apply this `MachineConfig` CR when you install the cluster.
26-
[NOTE]
27-
====
28-
If you use the `cpuPartitioningMode` field in the `SiteConfig` CR to configure workload partitioning, you do not need to use the `02-workload-partitioning.yaml` CR.
29-
Using the `cpuPartitioningMode` field is a Technology Preview feature in {product-title} 4.13.
30-
For more information, see "Workload partitioning in {sno} with {ztp}".
31-
====
32-
3324
a|`03-sctp-machine-config-master.yaml`
3425

3526
`03-sctp-machine-config-worker.yaml`
3627
|Loads the SCTP kernel module. These `MachineConfig` CRs are optional and can be omitted if you do not require this kernel module.
3728

38-
a|`04-accelerated-container-startup-master.yaml`
39-
40-
`04-accelerated-container-startup-worker.yaml`
41-
|Configures accelerated startup for the cluster.
42-
4329
a|`05-kdump-config-master.yaml`
4430

4531
`05-kdump-config-worker.yaml`
@@ -49,8 +35,36 @@ a|`05-kdump-config-master.yaml`
4935
`06-kdump-worker.yaml`
5036
|Configures kdump crash reporting for the cluster.
5137

38+
a|`07-sriov-related-kernel-args-master.yaml`
39+
|Configures SR-IOV kernel arguments in the cluster.
40+
41+
a|`08-set-rcu-normal-master.yaml`
42+
43+
`08-set-rcu-normal-worker.yaml`
44+
|Disables `rcu_expedited` mode after the cluster has rebooted.
45+
5246
a|`99-crio-disable-wipe-master.yaml`
5347

5448
`99-crio-disable-wipe-worker.yaml`
5549
|Disables the automatic CRI-O cache wipe following cluster reboot.
50+
51+
a|`99-sync-time-once-master.yaml`
52+
53+
`99-sync-time-once-worker.yaml`
54+
|Configures the one-time check and adjustment of the system clock by the Chrony service.
55+
56+
a|`enable-crun-master.yaml`
57+
58+
`enable-crun-worker.yaml`
59+
|Enables the `crun` OCI container runtime.
60+
61+
a|`extra-manifest/enable-cgroups-v1.yaml`
62+
63+
`source-crs/extra-manifest/enable-cgroups-v1.yaml`
64+
|Enables cgroups v1 during cluster installation and when generating {rh-rhacm} cluster policies.
5665
|====
66+
67+
[NOTE]
68+
====
69+
In {product-title} 4.14 and later, you configure workload partitioning with the `cpuPartitioningMode` field in the `SiteConfig` CR.
70+
====

scalability_and_performance/ztp_far_edge/ztp-vdu-validating-cluster-tuning.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ Before you can deploy virtual distributed unit (vDU) applications, you need to t
1111
[role="_additional-resources"]
1212
.Additional resources
1313

14-
* For more information about {sno} clusters tuned for vDU application deployments, see xref:../../scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc#sno-configure-for-vdu[Reference configuration for deploying vDUs on {sno}].
14+
* xref:../../scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc#ztp-workload-partitioning-sno_sno-configure-for-vdu[Workload partitioning in {sno} with {ztp}]
15+
16+
* xref:../../scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc#sno-configure-for-vdu[Reference configuration for deploying vDUs on {sno}]
1517
1618
include::modules/ztp-du-firmware-config-reference.adoc[leveloffset=+1]
1719

@@ -25,6 +27,8 @@ include::modules/ztp-recommended-cluster-mc-crs.adoc[leveloffset=+2]
2527
[role="_additional-resources"]
2628
.Additional resources
2729

30+
* xref:../../scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc#ztp-workload-partitioning-sno_sno-configure-for-vdu[Workload partitioning in {sno} with {ztp}]
31+
2832
* xref:../../scalability_and_performance/ztp_far_edge/ztp-preparing-the-hub-cluster.adoc#ztp-preparing-the-ztp-git-repository_ztp-preparing-the-hub-cluster[Extracting source CRs from the ztp-site-generate container]
2933

3034
include::modules/ztp-recommended-cluster-operators.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)