diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index c8d84ef17..0e2d65e85 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -428,9 +428,6 @@ spec: # proportional to the 256Mi-1Gi auto-computed reservation range. eviction-minimum-reclaim: "memory.available=256Mi" enforce-node-allocatable: "pods" - cgroups-per-qos: "true" - cgroup-driver: "systemd" - kernel-memcg-notification: "true" ignorePreflightErrors: - FileExisting-conntrack discovery: diff --git a/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml b/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml index bf92cea50..9303439c0 100644 --- a/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml +++ b/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml @@ -64,18 +64,6 @@ tests: path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable value: "pods" documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroups-per-qos - value: "true" - documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroup-driver - value: "systemd" - documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kernel-memcg-notification - value: "true" - documentIndex: 4 ########################################## # Empty kubelet: {} falls back to defaults @@ -698,18 +686,6 @@ tests: path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable value: "pods" documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroups-per-qos - value: "true" - documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroup-driver - value: "systemd" - documentIndex: 4 - - equal: - path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kernel-memcg-notification - value: "true" - documentIndex: 4 - equal: path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft-grace-period value: "memory.available=1m30s,nodefs.available=1m30s,imagefs.available=1m30s"