Use systemd as cgroup driver for shoots >= 1.23

Ref #5102 (comment)
gardener · Jan 12, 2022 · 53d1952 · 53d1952
1 parent fa9543c
commit 53d1952
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 1 deletion.
diff --git a/...botanist/component/extensions/operatingsystemconfig/original/components/kubelet/config.go b/...botanist/component/extensions/operatingsystemconfig/original/components/kubelet/config.go
@@ -51,7 +51,7 @@ func Config(kubernetesVersion *semver.Version, clusterDNSAddress, clusterDomain
 				CacheUnauthorizedTTL: metav1.Duration{Duration: 30 * time.Second},
 			},
 		},
-		CgroupDriver:                     "cgroupfs",
+		CgroupDriver:                     "systemd",
 		CgroupRoot:                       "/",
 		CgroupsPerQOS:                    pointer.Bool(true),
 		ClusterDNS:                       []string{clusterDNSAddress},
@@ -103,6 +103,10 @@ func Config(kubernetesVersion *semver.Version, clusterDNSAddress, clusterDomain
 		config.VolumePluginDir = pathVolumePluginDirectory
 	}
 
+	if version.ConstraintK8sLessEqual122.Check(kubernetesVersion) {
+		config.CgroupDriver = "cgroupfs"
+	}
+
 	return config
 }
 

diff --git a/...ist/component/extensions/operatingsystemconfig/original/components/kubelet/config_test.go b/...ist/component/extensions/operatingsystemconfig/original/components/kubelet/config_test.go
@@ -369,5 +369,82 @@ var _ = Describe("Config", func() {
 				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
 			},
 		),
+
+		Entry(
+			"kubernetes 1.21 w/o defaults",
+			"1.21.1",
+			clusterDNSAddress,
+			clusterDomain,
+			components.ConfigurableKubeletConfigParameters{},
+			kubeletConfigWithDefaults,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
+		Entry(
+			"kubernetes 1.21 w/ defaults",
+			"1.21.1",
+			clusterDNSAddress,
+			clusterDomain,
+			params,
+			kubeletConfigWithParams,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
+
+		Entry(
+			"kubernetes 1.22 w/o defaults",
+			"1.22.1",
+			clusterDNSAddress,
+			clusterDomain,
+			components.ConfigurableKubeletConfigParameters{},
+			kubeletConfigWithDefaults,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
+		Entry(
+			"kubernetes 1.22 w/ defaults",
+			"1.22.1",
+			clusterDNSAddress,
+			clusterDomain,
+			params,
+			kubeletConfigWithParams,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
+
+		Entry(
+			"kubernetes 1.23 w/o defaults",
+			"1.23.1",
+			clusterDNSAddress,
+			clusterDomain,
+			components.ConfigurableKubeletConfigParameters{},
+			kubeletConfigWithDefaults,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.CgroupDriver = "systemd"
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
+		Entry(
+			"kubernetes 1.23 w/ defaults",
+			"1.23.1",
+			clusterDNSAddress,
+			clusterDomain,
+			params,
+			kubeletConfigWithParams,
+			func(cfg *kubeletconfigv1beta1.KubeletConfiguration) {
+				cfg.CgroupDriver = "systemd"
+				cfg.RotateCertificates = true
+				cfg.VolumePluginDir = "/var/lib/kubelet/volumeplugins"
+			},
+		),
 	)
 })