[OKD only] pkg/asset: disable mitigations for FCOS installs

Author: Vadim Rutkovsky

pkg/asset/ignition/ignition_v2.go

@@ -191,6 +191,12 @@ func ForHyperthreadingDisabled(role string) *mcfgv1.MachineConfig {
 	}
 }
 
+// ForMitigationsDisabled creates the MachineConfig to disable mitigatations.
+// RHCOS doesn't need mitigations disabled, so this function is noop
+func ForMitigationsDisabled(role string) *mcfgv1.MachineConfig {
+	return &mcfgv1.MachineConfig{}
+}
+
 // InjectInstallInfo adds information about the installer and its invoker as a
 // ConfigMap to the provided bootstrap Ignition config.
 func InjectInstallInfo(bootstrap []byte) (string, error) {

pkg/asset/ignition/ignition_v3.go

@@ -192,6 +192,37 @@ func ForHyperthreadingDisabled(role string) *mcfgv1.MachineConfig {
 	}
 }
 
+// ForMitigationsDisabled creates the MachineConfig to disable mitigatations.
+// FCOS uses `/etc/pivot/kernel-args` to override the kernel arguments for hosts during pivot.
+func ForMitigationsDisabled(role string) *mcfgv1.MachineConfig {
+	return &mcfgv1.MachineConfig{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "machineconfiguration.openshift.io/v1",
+			Kind:       "MachineConfig",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: fmt.Sprintf("99-%s-disable-mitigations", role),
+			Labels: map[string]string{
+				"machineconfiguration.openshift.io/role": role,
+			},
+		},
+		Spec: mcfgv1.MachineConfigSpec{
+			Config: runtime.RawExtension{
+				Raw: MarshalOrDie(&igntypes3.Config{
+					Ignition: igntypes3.Ignition{
+						Version: igntypes3.MaxVersion.String(),
+					},
+					Storage: igntypes3.Storage{
+						Files: []igntypes3.File{
+							FileFromString("/etc/pivot/kernel-args", "root", 0600, "DELETE mitigations=auto,nosmt"),
+						},
+					},
+				}),
+			},
+		},
+	}
+}
+
 // InjectInstallInfo adds information about the installer and its invoker as a
 // ConfigMap to the provided bootstrap Ignition config.
 func InjectInstallInfo(bootstrap []byte) (string, error) {

pkg/asset/machines/master.go

@@ -372,6 +372,10 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 		machineConfigs = append(machineConfigs, ignition.ForFIPSEnabled("master"))
 	}
 
+	if ic.IsOKD() {
+		machineConfigs = append(machineConfigs, ignition.ForMitigationsDisabled("master"))
+	}
+
 	m.MachineConfigFiles, err = machineconfig.Manifests(machineConfigs, "master", directory)
 	if err != nil {
 		return errors.Wrap(err, "failed to create MachineConfig manifests for master machines")

pkg/asset/machines/worker.go

@@ -198,6 +198,9 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 		if ic.FIPS {
 			machineConfigs = append(machineConfigs, ignition.ForFIPSEnabled("worker"))
 		}
+		if ic.IsOKD() {
+			machineConfigs = append(machineConfigs, ignition.ForMitigationsDisabled("worker"))
+		}
 		switch ic.Platform.Name() {
 		case awstypes.Name:
 			subnets := map[string]string{}