Skip to content

Commit 31b94c0

Browse files
Merge pull request #1428 from sairameshv/remove_cgroupv1
OCPNODE-3874: Remove CgroupModeV1 reference from the code
2 parents 0714fc0 + 21a3c04 commit 31b94c0

File tree

1 file changed

+4
-4
lines changed
  • test/e2e/performanceprofile/functests/utils/cgroup

1 file changed

+4
-4
lines changed

test/e2e/performanceprofile/functests/utils/cgroup/cgroup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ func IsVersion2(ctx context.Context, c client.Client) (bool, error) {
3333
if err != nil {
3434
return false, fmt.Errorf("failed to get configs.node object. name=%q; %w", key.Name, err)
3535
}
36-
if nodecfg.Spec.CgroupMode == apiconfigv1.CgroupModeV1 {
37-
return false, nil
38-
}
3936
// in case `apiconfigv1.CgroupMode` not set, it's returned true since
4037
// the platform's default is cgroupV2
41-
return true, nil
38+
if nodecfg.Spec.CgroupMode == apiconfigv1.CgroupModeV2 || nodecfg.Spec.CgroupMode == apiconfigv1.CgroupModeEmpty {
39+
return true, nil
40+
}
41+
return false, nil
4242
}
4343

4444
// BuildGetter return a cgroup information getter that complies with

0 commit comments

Comments
 (0)