Skip to content

Commit 937a27b

Browse files
committed
fix(kubernetes): include eviction threshold in allocatable memory calculation
Signed-off-by: Arsolitt <[email protected]>
1 parent 6639e5c commit 937a27b

2 files changed

Lines changed: 31 additions & 12 deletions

File tree

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,25 @@ metadata:
251251
{{- else }}
252252
{{- fail (printf "nodeGroup %s: evictionHardMemory and evictionSoftMemory must use the same unit type (both percentage or both absolute) — got evictionHardMemory=%s, evictionSoftMemory=%s" $groupName $evictionHardMemory $evictionSoftMemory) }}
253253
{{- end }}
254-
{{/* Validate that reserved memory does not exceed effective node memory */}}
254+
{{/* Resolve eviction hard threshold to bytes for arithmetic.
255+
Percentage is relative to effective node memory; absolute values are used as-is. */}}
256+
{{- $evictionHardBytes := 0.0 }}
257+
{{- if $effectiveMemory }}
258+
{{- if hasSuffix "%" $evictionHardMemory }}
259+
{{- $evictionPct := trimSuffix "%" $evictionHardMemory | float64 }}
260+
{{- $evictionHardBytes = mulf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) (divf $evictionPct 100.0) }}
261+
{{- else }}
262+
{{- $evictionHardBytes = include "cozy-lib.resources.toFloat" $evictionHardMemory | float64 }}
263+
{{- end }}
264+
{{- end }}
265+
{{/* Validate that total reserved memory (system + kube + eviction) does not exceed effective node memory */}}
255266
{{- if $effectiveMemory }}
256267
{{- $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
257268
{{- $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
258-
{{- $totalReservedBytes := addf $sysBytes $kubeBytes }}
269+
{{- $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
259270
{{- $effectiveMemBytes := include "cozy-lib.resources.toFloat" $effectiveMemory | float64 }}
260271
{{- if ge $totalReservedBytes $effectiveMemBytes }}
261-
{{- fail (printf "nodeGroup %s: total reserved memory (systemReservedMemory=%s + kubeReservedMemory=%s) must be less than effective node memory (%s)" $groupName $systemReservedMemory $kubeReservedMemory $effectiveMemory) }}
272+
{{- fail (printf "nodeGroup %s: total reserved memory (systemReservedMemory=%s + kubeReservedMemory=%s + evictionHardMemory=%s) must be less than effective node memory (%s)" $groupName $systemReservedMemory $kubeReservedMemory $evictionHardMemory $effectiveMemory) }}
262273
{{- end }}
263274
{{- end }}
264275
---
@@ -377,7 +388,14 @@ metadata:
377388
annotations:
378389
cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "{{ $group.minReplicas }}"
379390
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "{{ $group.maxReplicas }}"
380-
{{- if and $group.resources $group.resources.memory }}
391+
{{- if $effectiveMemory }}
392+
{{- $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
393+
{{- $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
394+
{{- $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
395+
{{- $allocatableBytes := subf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) $totalReservedBytes }}
396+
{{- $allocatableMi := divf $allocatableBytes 1048576.0 | int }}
397+
capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $allocatableMi }}Mi"
398+
{{- else if and $group.resources $group.resources.memory }}
381399
capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $group.resources.memory }}"
382400
{{- else if and $instanceType $instanceType.spec $instanceType.spec.memory $instanceType.spec.memory.guest }}
383401
capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $instanceType.spec.memory.guest }}"

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,9 @@ tests:
429429
resources:
430430
memory: "512Mi"
431431
asserts:
432-
# 512Mi, 5% = 25Mi, but floor is 256Mi -> 256Mi+256Mi = 512Mi >= 512Mi -> fails validation
432+
# 512Mi, 5% = 25Mi, but floor is 256Mi -> 256Mi+256Mi+7%eviction(35Mi) = 547Mi > 512Mi -> fails validation
433433
- failedTemplate:
434-
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=256Mi + kubeReservedMemory=256Mi) must be less than effective node memory (512Mi)"
434+
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=256Mi + kubeReservedMemory=256Mi + evictionHardMemory=7%) must be less than effective node memory (512Mi)"
435435

436436
##################################
437437
# Clamp logic: 1024Mi ceiling #
@@ -1040,8 +1040,9 @@ tests:
10401040
systemReservedMemory: "512Mi"
10411041
kubeReservedMemory: "600Mi"
10421042
asserts:
1043+
# 1Gi = 1024Mi, 512+600+71(7% eviction) = 1183 > 1024
10431044
- failedTemplate:
1044-
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=600Mi) must be less than effective node memory (1Gi)"
1045+
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=600Mi + evictionHardMemory=7%) must be less than effective node memory (1Gi)"
10451046

10461047
- it: rejects reserved memory equal to effective node memory
10471048
release:
@@ -1068,8 +1069,9 @@ tests:
10681069
systemReservedMemory: "512Mi"
10691070
kubeReservedMemory: "512Mi"
10701071
asserts:
1072+
# 1Gi = 1024Mi, 512+512+71(7% eviction) = 1095 > 1024
10711073
- failedTemplate:
1072-
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=512Mi) must be less than effective node memory (1Gi)"
1074+
errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=512Mi + evictionHardMemory=7%) must be less than effective node memory (1Gi)"
10731075

10741076
- it: allows reserved memory within effective node memory bounds
10751077
release:
@@ -1109,7 +1111,7 @@ tests:
11091111
# Eviction thresholds interaction with explicit reservations
11101112
#############################################################
11111113

1112-
- it: renders aggressive absolute eviction with explicit reservations on small node
1114+
- it: renders aggressive absolute eviction with explicit reservations on node
11131115
release:
11141116
name: test-k8s
11151117
namespace: tenant-test
@@ -1129,15 +1131,14 @@ tests:
11291131
roles:
11301132
- worker
11311133
resources:
1132-
memory: "4Gi"
1134+
memory: "8Gi"
11331135
kubelet:
11341136
systemReservedMemory: "512Mi"
11351137
kubeReservedMemory: "512Mi"
11361138
evictionHardMemory: "3Gi"
11371139
evictionSoftMemory: "3.5Gi"
11381140
asserts:
1139-
# 4Gi node, 1Gi reserved, 3Gi hard eviction — only ~3Gi for workloads.
1140-
# Valid config: template allows aggressive eviction relative to reservations.
1141+
# 8Gi node, 1Gi reserved, 3Gi hard eviction — total 4Gi < 8Gi, passes validation.
11411142
- equal:
11421143
path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
11431144
value: "memory=512Mi,cpu=100m"

0 commit comments

Comments
 (0)