Merge pull request #8178 from khdo/ocpbugs26216

OCPBUGS-26216: Fix parameter used to disable smt for ppc64 systems
openshift · May 3, 2024 · 1cb86cb · 1cb86cb
2 parents adb699e + 30c88c2
commit 1cb86cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkg/asset/machines/machineconfig/hyperthreading.go b/pkg/asset/machines/machineconfig/hyperthreading.go
@@ -37,7 +37,7 @@ func ForHyperthreadingDisabled(role string) (*mcfgv1.MachineConfig, error) {
 		},
 		Spec: mcfgv1.MachineConfigSpec{
 			Config:          rawExt,
-			KernelArguments: []string{"nosmt"},
+			KernelArguments: []string{"nosmt", "smt-enabled=off"},
 		},
 	}, nil
 }
diff --git a/pkg/asset/machines/master_test.go b/pkg/asset/machines/master_test.go
@@ -79,6 +79,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `},
@@ -103,6 +104,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `, `apiVersion: machineconfiguration.openshift.io/v1

diff --git a/pkg/asset/machines/worker_test.go b/pkg/asset/machines/worker_test.go
@@ -73,6 +73,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `},
@@ -97,6 +98,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `, `apiVersion: machineconfiguration.openshift.io/v1