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): add zero-value validation for kubelet reservation fields

Browse Source 
User-supplied memory and CPU reservation values that parse to zero or
negative are now rejected with a clear error message. The format regex
alone cannot catch semantic invalidity like "0Mi" or "0m".

Signed-off-by: Arsolitt <arsolitt@gmail.com>
This commit is contained in:
Arsolitt committed 2026-04-23 17:02:55 +03:00
1 parent 7fe749e2bb
commit a5e361c3dc
1 file changed
+23
Download Patch File Download Diff File Expand all files Collapse all files
packages/apps/kubernetes/templates/cluster.yaml
+23
View File
@@ -240,6 +240,29 @@ metadata:
{{- fail (printf "nodeGroup %s: invalid %s value %q — must be %s" $groupName .key (.value | toString) .hint) }}
{{- end }}
{{- end }}
{{/* Validate that user-supplied reservation values are positive (non-zero) */}}
{{- range $_, $entry := list (dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory) (dict "key" "kubeReservedMemory" "value" $kubeletOverride.kubeReservedMemory) }}
{{- if $entry.value }}
{{- $bytes := include "cozy-lib.resources.toFloat" ($entry.value | toString) | float64 }}
{{- if le $bytes 0.0 }}
{{- fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key ($entry.value | toString)) }}
{{- end }}
{{- end }}
{{- end }}
{{- range $_, $entry := list (dict "key" "systemReservedCpu" "value" $kubeletOverride.systemReservedCpu) (dict "key" "kubeReservedCpu" "value" $kubeletOverride.kubeReservedCpu) }}
{{- if $entry.value }}
{{- $cpuStr := $entry.value | toString }}
{{- $cpuVal := 0.0 }}
{{- if hasSuffix "m" $cpuStr }}
{{- $cpuVal = trimSuffix "m" $cpuStr | float64 }}
{{- else }}
{{- $cpuVal = $cpuStr | float64 }}
{{- end }}
{{- if le $cpuVal 0.0 }}
{{- fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key $cpuStr) }}
{{- end }}
{{- end }}
{{- end }}
{{/* Validate absolute eviction threshold formats before converting */}}
{{- if not (hasSuffix "%" $evictionHardMemory) }}
{{- if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionHardMemory) }}