Merge pull request #5343 from ngopalak-redhat/ngopalak/enable_psi_non_rt

OCPNODE-3806: Do not change default PSI setting in MCO

Author: openshift-merge-bot[bot]

pkg/controller/kubelet-config/helpers.go

@@ -152,7 +152,7 @@ func updateMachineConfigwithCgroup(node *osev1.Node, mc *mcfgv1.MachineConfig) e
 	// updating the Machine Config resource with the relevant cgroup config
 	var (
 		kernelArgsv1                                            = []string{"systemd.unified_cgroup_hierarchy=0", "systemd.legacy_systemd_cgroup_controller=1"}
-		kernelArgsv2                                            = []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\"", "psi=0"}
+		kernelArgsv2                                            = []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\""}
 		kernelArgsToAdd, kernelArgsToRemove, adjustedKernelArgs []string
 	)
 	switch node.Spec.CgroupMode {

pkg/controller/kubelet-config/kubelet_config_nodes_test.go

@@ -90,13 +90,13 @@ func TestBootstrapNodeConfigDefault(t *testing.T) {
 	}{
 		configNodeCgroupDefault: {
 			Name:             "Default",
-			MasterKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\"", "psi=0"},
-			WorkerKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\"", "psi=0"},
+			MasterKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\""},
+			WorkerKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\""},
 		},
 		configNodeCgroupV2: {
 			Name:             "Cgroupv2",
-			MasterKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\"", "psi=0"},
-			WorkerKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\"", "psi=0"},
+			MasterKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\""},
+			WorkerKernelArgs: []string{"systemd.unified_cgroup_hierarchy=1", "cgroup_no_v1=\"all\""},
 		},
 	}