Support configuring cgroupMode (#69)

* Support configuring cgroupMode

* Add suggestions from review

---------

Co-authored-by: Stephan Feurer <stephan.feurer@vshn.ch>

class/defaults.yml

@@ -42,6 +42,8 @@ parameters:
                 tags: []
                 userDataSecret:
                   name: worker-user-data
+    nodeConfig:
+      cgroupMode: v1
 
     nodeGroups: {}
 

class/openshift4-nodes.yml

@@ -9,6 +9,7 @@ parameters:
           - openshift4-nodes/component/machine-sets.jsonnet
           - openshift4-nodes/component/machine-config-pools.jsonnet
           - openshift4-nodes/component/machine-configs.jsonnet
+          - openshift4-nodes/component/node-config.jsonnet
           - openshift4-nodes/component/kubelet.jsonnet
           - openshift4-nodes/component/container-runtime.jsonnet
           - openshift4-nodes/component/oc-debug-node.jsonnet

component/node-config.jsonnet

@@ -0,0 +1,18 @@
+local common = import 'common.libsonnet';
+local com = import 'lib/commodore.libjsonnet';
+local kap = import 'lib/kapitan.libjsonnet';
+local kube = import 'lib/kube.libjsonnet';
+local inv = kap.inventory();
+
+local params = inv.parameters.openshift4_nodes;
+
+local nodeConfig = kube._Object('config.openshift.io/v1', 'Node', 'cluster') {
+  metadata+: {
+    labels+: common.DefaultLabels,
+  },
+  spec: params.nodeConfig,
+};
+
+{
+  '10_nodeconfig': nodeConfig,
+}

docs/modules/ROOT/pages/references/parameters.adoc

@@ -63,7 +63,6 @@ Configuring this higher up in the hierarchy can result in unexpected behavior.
 
 == `machine_api_namespace`
 
-
 [horizontal]
 type:: string
 default:: `openshift-machine-api`
@@ -72,6 +71,22 @@ The namespace where machine-api related objects should be created.
 
 TIP: Namespaced resources without an explicit `.metadata.namespace` field will be deployed in this namespace as well.
 
+== `nodeConfig`
+
+[horizontal]
+type:: dictionary
+default::
++
+[source,yaml]
+----
+cgroupMode: v1
+----
+
+A dictionary holding the default values applied to the `node.config.openshift.io` object created by this component.
+
+You can switch between cgroup v1 and cgroup v2, as needed, by editing the node.config object.
+For more information, see https://docs.openshift.com/container-platform/latest/installing/install_config/enabling-cgroup-v2.html[Enabling Linux control group version 2].
+
 == `nodeGroups`
 
 [horizontal]

tests/golden/defaults/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/gcp/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/machineconfig/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/maxpods/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/pidslimit/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/remove-machineconfigpool/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1

tests/golden/syn-monitoring/openshift4-nodes/openshift4-nodes/10_nodeconfig.yaml

@@ -0,0 +1,12 @@
+apiVersion: config.openshift.io/v1
+kind: Node
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: openshift4-nodes
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: openshift4-nodes
+    name: cluster
+  name: cluster
+spec:
+  cgroupMode: v1