Merge pull request #2181 from sairameshv/deprecate_cgroupv1

openshift-merge-bot[bot] · web-flow · commit c36b6ae2bbb5 · 2025-04-01T19:09:01.000Z
OCPNODE-2877: Remove support to configure cgroupsv1 in OCP
diff --git a/config/v1/tests/nodes.config.openshift.io/AAA_ungated.yaml b/config/v1/tests/nodes.config.openshift.io/AAA_ungated.yaml
@@ -12,3 +12,111 @@ tests:
         apiVersion: config.openshift.io/v1
         kind: Node
         spec: {}
+    - name: Should be able to create a Node object with cgroupMode set to "v2"
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+    - name: Should not allow to create a Node object with the cgroupMode set to "v1"
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+      expectedError: "spec.cgroupMode: Unsupported value: \"v1\""
+    - name: Should not allow to create a Node object with the cgroupMode set to unknown value
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "unknown"
+      expectedError: "spec.cgroupMode: Unsupported value: \"unknown\""
+  onUpdate:
+    - name: Should be able to update a Node object with cgroupMode set to "v2"
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec: {}
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+    - name: Should not allow update of cgroupMode from "v2" to "v1"
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+      expectedError: "spec.cgroupMode: Unsupported value: \"v1\""
+    - name: Should allow changing fields other than cgroupMode when a persisted value "v1" is no longer valid
+      initialCRDPatches:
+        - op: replace
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/cgroupMode
+          value:
+            enum:
+              - v1
+              - v2
+              - ""
+            type: string
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+          workerLatencyProfile: "MediumUpdateAverageReaction"
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+          workerLatencyProfile: "MediumUpdateAverageReaction"
+    - name: Should allow updating a persisted value of cgroupMode that is no longer valid "v1" to a valid value "v2"
+      initialCRDPatches:
+        - op: replace
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/cgroupMode
+          value:
+            enum:
+              - v1
+              - v2
+              - ""
+            type: string
+      initial: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v1"
+          workerLatencyProfile: "MediumUpdateAverageReaction"
+      updated: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+          workerLatencyProfile: "MediumUpdateAverageReaction"
+      expected: |
+        apiVersion: config.openshift.io/v1
+        kind: Node
+        spec:
+          cgroupMode: "v2"
+          workerLatencyProfile: "MediumUpdateAverageReaction"
diff --git a/config/v1/types_node.go b/config/v1/types_node.go
@@ -74,14 +74,14 @@ type NodeStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
-// +kubebuilder:validation:Enum=v1;v2;""
+// +kubebuilder:validation:Enum=v2;""
 type CgroupMode string
 
 const (
 	CgroupModeEmpty   CgroupMode = "" // Empty string indicates to honor user set value on the system that should not be overridden by OpenShift
 	CgroupModeV1      CgroupMode = "v1"
 	CgroupModeV2      CgroupMode = "v2"
-	CgroupModeDefault CgroupMode = CgroupModeV1
+	CgroupModeDefault CgroupMode = CgroupModeV2
 )
 
 // +kubebuilder:validation:Enum=Default;MediumUpdateAverageReaction;LowUpdateSlowReaction
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-CustomNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-Default.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-DevPreviewNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-TechPreviewNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/nodes.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/nodes.config.openshift.io/AAA_ungated.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/nodes.config.openshift.io/MinimumKubeletVersion.yaml b/config/v1/zz_generated.featuregated-crd-manifests/nodes.config.openshift.io/MinimumKubeletVersion.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/payload-manifests/crds/0000_10_config-operator_01_nodes-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_nodes-CustomNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/payload-manifests/crds/0000_10_config-operator_01_nodes-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_nodes-Default.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/payload-manifests/crds/0000_10_config-operator_01_nodes-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_nodes-DevPreviewNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string
diff --git a/payload-manifests/crds/0000_10_config-operator_01_nodes-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_nodes-TechPreviewNoUpgrade.crd.yaml
@@ -49,7 +49,6 @@ spec:
               cgroupMode:
                 description: cgroupMode determines the cgroups version on the node
                 enum:
-                - v1
                 - v2
                 - ""
                 type: string

Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,14 @@ type NodeStatus struct {`
`74`	`74`	Conditions []metav1.Condition `json:"conditions,omitempty"`
`75`	`75`	`}`
`76`	`76`
`77`		`-// +kubebuilder:validation:Enum=v1;v2;""`
	`77`	`+// +kubebuilder:validation:Enum=v2;""`
`78`	`78`	`type CgroupMode string`
`79`	`79`
`80`	`80`	`const (`
`81`	`81`	`CgroupModeEmpty CgroupMode = "" // Empty string indicates to honor user set value on the system that should not be overridden by OpenShift`
`82`	`82`	`CgroupModeV1 CgroupMode = "v1"`
`83`	`83`	`CgroupModeV2 CgroupMode = "v2"`
`84`		`- CgroupModeDefault CgroupMode = CgroupModeV1`
	`84`	`+ CgroupModeDefault CgroupMode = CgroupModeV2`
`85`	`85`	`)`
`86`	`86`
`87`	`87`	`// +kubebuilder:validation:Enum=Default;MediumUpdateAverageReaction;LowUpdateSlowReaction`