From 0f18ebef8f753c5d23ef4066411edb93a2a74e2e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 3 Sep 2020 14:57:57 +0000 Subject: [PATCH] machineconfig: Use nosmt KernelArgument now This replaces https://github.com/openshift/installer/pull/2805 Eventually it'd be nice to drop the deprecated `/etc/pivot/` stuff from the MCO, this is a step towards that. --- .../machines/machineconfig/hyperthreading.go | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkg/asset/machines/machineconfig/hyperthreading.go b/pkg/asset/machines/machineconfig/hyperthreading.go index d8ef70b4546..0c6215c15b7 100644 --- a/pkg/asset/machines/machineconfig/hyperthreading.go +++ b/pkg/asset/machines/machineconfig/hyperthreading.go @@ -3,32 +3,13 @@ package machineconfig import ( "fmt" - igntypes "github.com/coreos/ignition/v2/config/v3_1/types" mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "github.com/openshift/installer/pkg/asset/ignition" ) // ForHyperthreadingDisabled creates the MachineConfig to disable hyperthreading. -// RHCOS ships with pivot.service that uses the `/etc/pivot/kernel-args` to override the kernel arguments for hosts. +// See https://github.com/openshift/machine-config-operator/blob/master/docs/MachineConfiguration.md#kernelarguments func ForHyperthreadingDisabled(role string) (*mcfgv1.MachineConfig, error) { - ignConfig := igntypes.Config{ - Ignition: igntypes.Ignition{ - Version: igntypes.MaxVersion.String(), - }, - Storage: igntypes.Storage{ - Files: []igntypes.File{ - ignition.FileFromString("/etc/pivot/kernel-args", "root", 0600, "ADD nosmt"), - }, - }, - } - - rawExt, err := ignition.ConvertToRawExtension(ignConfig) - if err != nil { - return nil, err - } - return &mcfgv1.MachineConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: "machineconfiguration.openshift.io/v1", @@ -41,7 +22,8 @@ func ForHyperthreadingDisabled(role string) (*mcfgv1.MachineConfig, error) { }, }, Spec: mcfgv1.MachineConfigSpec{ - Config: rawExt, + // See https://access.redhat.com/solutions/rhel-smt + KernelArguments: []string{"nosmt"}, }, }, nil }