admin/cozystack
1
0 Fork 0
mirror of https://github.com/cozystack/cozystack.git synced 2026-11-09 22:13:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(kubernetes): subtract CPU reservations in capacity annotation

Browse Source 
The CPU capacity annotation previously reported raw effective CPU
without subtracting system-reserved and kube-reserved. Now it computes
allocatable CPU (effective minus reservations) to match what the cluster
autoscaler uses for scaling decisions.

Also fix the CPU total validation block to use cozy-lib.resources.toFloat
for consistent millicore parsing.

Signed-off-by: Arsolitt <arsolitt@gmail.com>
This commit is contained in:
Arsolitt committed 2026-04-23 17:02:55 +03:00
1 parent 76def543e5
commit 70ac79d3d3
1 file changed
+22 -5
Download Patch File Download Diff File Expand all files Collapse all files
packages/apps/kubernetes/templates/cluster.yaml
+22 -5
View File
@@ -347,7 +347,8 @@ metadata:
{{- $kubeCpuMillis = mulf ($kubeCpuStr | float64) 1000.0 }}
{{- end }}
{{- $totalCpuMillis := addf $sysCpuMillis $kubeCpuMillis }}
{{- $effectiveCpuMillis := mulf ($effectiveCpu | float64) 1000.0 }}
{{- $effectiveCpuFloatV := include "cozy-lib.resources.toFloat" $effectiveCpu | float64 }}
{{- $effectiveCpuMillis := mulf $effectiveCpuFloatV 1000.0 }}
{{- if ge $totalCpuMillis $effectiveCpuMillis }}
{{- fail (printf "nodeGroup %s: total reserved CPU (systemReservedCpu=%s + kubeReservedCpu=%s) must be less than effective node CPU (%s cores)" $groupName $systemReservedCpu $kubeReservedCpu $effectiveCpu) }}
{{- end }}
@@ -489,10 +490,26 @@ metadata:
{{- $allocatableMi := divf $allocatableBytes 1048576.0 | ceil }}
capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $allocatableMi }}Mi"
{{- end }}
{{- if and $group.resources $group.resources.cpu }}
capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $group.resources.cpu }}"
{{- else if and $instanceType $instanceType.spec $instanceType.spec.cpu $instanceType.spec.cpu.guest }}
capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $instanceType.spec.cpu.guest }}"
{{- if $effectiveCpu }}
{{- $sysCpuStr := $systemReservedCpu | toString }}
{{- $kubeCpuStr := $kubeReservedCpu | toString }}
{{- $sysCpuMillisA := 0.0 }}
{{- $kubeCpuMillisA := 0.0 }}
{{- if hasSuffix "m" $sysCpuStr }}
{{- $sysCpuMillisA = trimSuffix "m" $sysCpuStr | float64 }}
{{- else }}
{{- $sysCpuMillisA = mulf ($sysCpuStr | float64) 1000.0 }}
{{- end }}
{{- if hasSuffix "m" $kubeCpuStr }}
{{- $kubeCpuMillisA = trimSuffix "m" $kubeCpuStr | float64 }}
{{- else }}
{{- $kubeCpuMillisA = mulf ($kubeCpuStr | float64) 1000.0 }}
{{- end }}
{{- $effectiveCpuFloatA := include "cozy-lib.resources.toFloat" $effectiveCpu | float64 }}
{{- $effectiveCpuMillisA := mulf $effectiveCpuFloatA 1000.0 }}
{{- $allocatableCpuMillis := subf $effectiveCpuMillisA (addf $sysCpuMillisA $kubeCpuMillisA) }}
{{- $allocatableCpuMillisInt := $allocatableCpuMillis | ceil | int }}
capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $allocatableCpuMillisInt }}m"
{{- end }}
spec:
clusterName: {{ $.Release.Name }}