Skip to content

Commit 6639e5c

Browse files
committed
fix(kubernetes): accept all valid K8s quantity forms in reservation validation
Signed-off-by: Arsolitt <[email protected]>
1 parent 09517c4 commit 6639e5c

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ metadata:
215215
$kubeletOverride), not the resolved/computed default. The resolved
216216
default is always valid by construction, so only user input needs validation. */}}
217217
{{- $validations := list
218-
(dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi)")
219-
(dict "key" "kubeReservedMemory" "value" $kubeletOverride.kubeReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi)")
220-
(dict "key" "systemReservedCpu" "value" $kubeletOverride.systemReservedCpu "pattern" `^[0-9]+(\.[0-9]+)?m?$` "hint" "a valid Kubernetes CPU quantity (e.g. 100m, 0.5, 1)")
221-
(dict "key" "kubeReservedCpu" "value" $kubeletOverride.kubeReservedCpu "pattern" `^[0-9]+(\.[0-9]+)?m?$` "hint" "a valid Kubernetes CPU quantity (e.g. 100m, 0.5, 1)")
218+
(dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
219+
(dict "key" "kubeReservedMemory" "value" $kubeletOverride.kubeReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
220+
(dict "key" "systemReservedCpu" "value" $kubeletOverride.systemReservedCpu "pattern" `^[0-9]+(\.[0-9]+)?m?$` "hint" "a valid Kubernetes CPU quantity (e.g. 100m, 0.5, 1)")
221+
(dict "key" "kubeReservedCpu" "value" $kubeletOverride.kubeReservedCpu "pattern" `^[0-9]+(\.[0-9]+)?m?$` "hint" "a valid Kubernetes CPU quantity (e.g. 100m, 0.5, 1)")
222222
}}
223223
{{- range $validations }}
224224
{{- if and .value (not (regexMatch .pattern (.value | toString))) }}
@@ -227,13 +227,13 @@ metadata:
227227
{{- end }}
228228
{{/* Validate absolute eviction threshold formats before converting */}}
229229
{{- if not (hasSuffix "%" $evictionHardMemory) }}
230-
{{- if not (regexMatch `^[0-9]+(\.[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionHardMemory) }}
231-
{{- fail (printf "nodeGroup %s: invalid evictionHardMemory value %q — must be a percentage (e.g. 7%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi)" $groupName $evictionHardMemory) }}
230+
{{- if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionHardMemory) }}
231+
{{- fail (printf "nodeGroup %s: invalid evictionHardMemory value %q — must be a percentage (e.g. 7%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionHardMemory) }}
232232
{{- end }}
233233
{{- end }}
234234
{{- if not (hasSuffix "%" $evictionSoftMemory) }}
235-
{{- if not (regexMatch `^[0-9]+(\.[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionSoftMemory) }}
236-
{{- fail (printf "nodeGroup %s: invalid evictionSoftMemory value %q — must be a percentage (e.g. 10%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi)" $groupName $evictionSoftMemory) }}
235+
{{- if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionSoftMemory) }}
236+
{{- fail (printf "nodeGroup %s: invalid evictionSoftMemory value %q — must be a percentage (e.g. 10%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionSoftMemory) }}
237237
{{- end }}
238238
{{- end }}
239239
{{- if and (hasSuffix "%" $evictionHardMemory) (hasSuffix "%" $evictionSoftMemory) }}

0 commit comments

Comments
 (0)