Skip to content

Commit 51ae51f

Browse files
committed
feat(kubernetes): make eviction-soft threshold configurable
Add evictionSoftMemory field to kubelet configuration with default 10%. Signed-off-by: Arsolitt <[email protected]>
1 parent 55eafab commit 51ae51f

5 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎api/apps/v1alpha1/kubernetes/types.go‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/apps/kubernetes/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ See the reference for components utilized in this service:
110110
| `nodeGroups[name].kubelet.systemReservedCpu` | CPU reserved for host OS. | `string` | `100m` |
111111
| `nodeGroups[name].kubelet.kubeReservedCpu` | CPU reserved for kubelet and container runtime. | `string` | `100m` |
112112
| `nodeGroups[name].kubelet.evictionHardMemory` | Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%). | `string` | `7%` |
113+
| `nodeGroups[name].kubelet.evictionSoftMemory` | Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%). | `string` | `10%` |
113114
| `version` | Kubernetes major.minor version to deploy | `string` | `v1.35` |
114115
| `host` | External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty. | `string` | `""` |
115116

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ metadata:
210210
{{- $systemReservedCpu := $kubeletOverride.systemReservedCpu | default "100m" }}
211211
{{- $kubeReservedCpu := $kubeletOverride.kubeReservedCpu | default "100m" }}
212212
{{- $evictionHardMemory := $kubeletOverride.evictionHardMemory | default "7%" }}
213+
{{- $evictionSoftMemory := $kubeletOverride.evictionSoftMemory | default "10%" }}
213214
---
214215
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
215216
kind: KubeadmConfigTemplate
@@ -283,7 +284,7 @@ spec:
283284
system-reserved: "memory={{ $systemReservedMemory }},cpu={{ $systemReservedCpu }}"
284285
kube-reserved: "memory={{ $kubeReservedMemory }},cpu={{ $kubeReservedCpu }}"
285286
eviction-hard: "memory.available<{{ $evictionHardMemory }}"
286-
eviction-soft: "memory.available<1Gi"
287+
eviction-soft: "memory.available<{{ $evictionSoftMemory }}"
287288
eviction-soft-grace-period: "memory.available=1m30s"
288289
eviction-minimum-reclaim: "memory.available=256Mi"
289290
enforce-node-allocatable: "pods,system-reserved,kube-reserved"

‎packages/apps/kubernetes/values.schema.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@
7979
"type": "string",
8080
"default": "7%"
8181
},
82+
"evictionSoftMemory": {
83+
"description": "Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).",
84+
"type": "string",
85+
"default": "10%"
86+
},
8287
"kubeReservedCpu": {
8388
"description": "CPU reserved for kubelet and container runtime.",
8489
"type": "string",

0 commit comments

Comments
 (0)