Skip to content

Commit 390bdc4

Browse files
ArsolittArsolitt
committed
fix(kubernetes): remove deprecated kubelet CLI flags
Remove cgroups-per-qos, cgroup-driver, and kernel-memcg-notification from kubeletExtraArgs. These flags are deprecated or already removed from kubelet CLI, and their functionality is either the default behavior or handled via KubeletConfiguration. Signed-off-by: Arsolitt <[email protected]>
1 parent a3b35c6 commit 390bdc4

2 files changed

Lines changed: 0 additions & 27 deletions

File tree

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,6 @@ spec:
428428
# proportional to the 256Mi-1Gi auto-computed reservation range.
429429
eviction-minimum-reclaim: "memory.available=256Mi"
430430
enforce-node-allocatable: "pods"
431-
cgroups-per-qos: "true"
432-
cgroup-driver: "systemd"
433-
kernel-memcg-notification: "true"
434431
ignorePreflightErrors:
435432
- FileExisting-conntrack
436433
discovery:

‎packages/apps/kubernetes/tests/kubelet-reservation_test.yaml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@ tests:
6464
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable
6565
value: "pods"
6666
documentIndex: 4
67-
- equal:
68-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroups-per-qos
69-
value: "true"
70-
documentIndex: 4
71-
- equal:
72-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroup-driver
73-
value: "systemd"
74-
documentIndex: 4
75-
- equal:
76-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kernel-memcg-notification
77-
value: "true"
78-
documentIndex: 4
7967

8068
##########################################
8169
# Empty kubelet: {} falls back to defaults
@@ -698,18 +686,6 @@ tests:
698686
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable
699687
value: "pods"
700688
documentIndex: 4
701-
- equal:
702-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroups-per-qos
703-
value: "true"
704-
documentIndex: 4
705-
- equal:
706-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.cgroup-driver
707-
value: "systemd"
708-
documentIndex: 4
709-
- equal:
710-
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kernel-memcg-notification
711-
value: "true"
712-
documentIndex: 4
713689
- equal:
714690
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft-grace-period
715691
value: "memory.available=1m30s,nodefs.available=1m30s,imagefs.available=1m30s"

0 commit comments

Comments
 (0)