Skip to content

Commit a2a3c1e

Browse files
authored
Merge pull request #53510 from rohennes/OCPBUGS-3407-workload-partitionin-yaml
OCPBUGS-3407 - Workload partitioning wrong CRI-O configuration key
2 parents 30187b4 + edd8991 commit a2a3c1e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ During {sno} cluster installation, you must enable workload partitioning. This l
1010

1111
[NOTE]
1212
====
13-
You can enable workload partitioning only during cluster installation. You cannot disable workload partitioning post-installation. However, you can reconfigure workload partitioning by updating the `cpu` value that you define in the performance profile, and in the related `MachineConfig` custom resource (CR).
13+
You can enable workload partitioning only during cluster installation. You cannot disable workload partitioning post-installation. However, you can reconfigure workload partitioning by updating the `cpu` value that you define in the performance profile, and in the related `cpuset` value in the `MachineConfig` custom resource (CR).
1414
====
1515

1616
* The base64-encoded CR that enables workload partitioning contains the CPU set that the management workloads are constrained to. Encode host-specific values for `crio.conf` and `kubelet.conf` in base64. This content must be adjusted to match the CPU set that is specified in the cluster performance profile and must be accurate for the number of cores in the cluster host.
@@ -52,11 +52,13 @@ spec:
5252
[crio.runtime.workloads.management]
5353
activation_annotation = "target.workload.openshift.io/management"
5454
annotation_prefix = "resources.workload.openshift.io"
55-
resources = { "cpushares" = 0, "cpuset" = "0-1,52-53" } <1>
55+
[crio.runtime.workloads.management.resources]
56+
cpushares = 0
57+
cpuset = "0-1, 52-53" <1>
5658
----
57-
<1> The `CPUs` value varies based on the installation.
59+
<1> The `cpuset` value varies based on the installation.
5860
+
59-
If Hyper-Threading is enabled, specify both threads for each core. The `CPUs` value must match the reserved CPU set specified in the performance profile.
61+
If Hyper-Threading is enabled, specify both threads for each core. The `cpuset` value must match the reserved CPUs that you define in the `spec.cpu.reserved` field in the performance profile.
6062
6163
* When configured in the cluster, the contents of `/etc/kubernetes/openshift-workload-pinning` should look like this:
6264
+
@@ -68,4 +70,4 @@ If Hyper-Threading is enabled, specify both threads for each core. The `CPUs` va
6870
}
6971
}
7072
----
71-
<1> The `cpuset` must match the `CPUs` value in `/etc/crio/crio.conf.d/01-workload-partitioning`.
73+
<1> The `cpuset` must match the `cpuset` value in `/etc/crio/crio.conf.d/01-workload-partitioning`.

0 commit comments

Comments
 (0)