change cgroup-driver to systemd

Kind images for k8s v1.24 require `cgroup-driver: systemd` to be set kubernetes-sigs/kind#1726
vmware-tanzu · Nov 16, 2022 · 49b399f · 49b399f
1 parent 0bc7af8
commit 49b399f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/packages/tkg-clusterclass-docker/bundle/config/upstream/base.yaml b/packages/tkg-clusterclass-docker/bundle/config/upstream/base.yaml
@@ -148,10 +148,10 @@ spec:
           jsonPatches:
             - op: add
               path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
             - op: add
               path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
     - name: antrea-prekubeadm
       definitions:
         - selector:
@@ -188,7 +188,7 @@ spec:
           jsonPatches:
             - op: add
               path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
     - name: customImage
       description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments."
       definitions:

diff --git a/providers/infrastructure-docker/v1.2.4/cconly/base.yaml b/providers/infrastructure-docker/v1.2.4/cconly/base.yaml
@@ -148,10 +148,10 @@ spec:
           jsonPatches:
             - op: add
               path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
             - op: add
               path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
     - name: antrea-prekubeadm
       definitions:
         - selector:
@@ -188,7 +188,7 @@ spec:
           jsonPatches:
             - op: add
               path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
-              value: cgroupfs
+              value: systemd
     - name: customImage
       description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments."
       definitions:

diff --git a/providers/infrastructure-docker/v1.2.4/ytt/base-template.yaml b/providers/infrastructure-docker/v1.2.4/ytt/base-template.yaml
@@ -67,17 +67,13 @@ spec:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs:
-          # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
-          # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
-          cgroup-driver: cgroupfs
+          cgroup-driver: systemd
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs:
-          # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
-          # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
-          cgroup-driver: cgroupfs
+          cgroup-driver: systemd
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     preKubeadmCommands: []
     files: []