(fix) make regex for resources more strict (#1072)
* make regex for resources more strict * Update validation docs * Review feedback
This commit is contained in:
parent
7f89550d08
commit
1eb46b4fb7
|
@ -15,8 +15,8 @@ Accepted formats are:
|
|||
- Float (eg. `0.5`) - This means half hyperthread
|
||||
- Milicpu (eg. `500m`) This means also half hyperthread
|
||||
|
||||
Regex used to match those: `^([0-9]+)(\.[0-9]?|m?)$`
|
||||
You can try live [here](https://regex101.com/r/pFoJTx/1)
|
||||
Regex used to match those: `^(?!^0(\.0|m|)$)([0-9]+)(\.[0-9]|m?)$`
|
||||
You can try live [here](https://regex101.com/r/WxComc/1)
|
||||
More detailed info can be found [here](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu)
|
||||
|
||||
__`Memory RAM`__
|
||||
|
@ -27,8 +27,8 @@ Accepted formats are:
|
|||
- Plain integer (eg. `134217728`) - This means 128Megabyte of RAM
|
||||
- As an exponent format (eg. `134e6`) This means ~128Megabyte of RAM
|
||||
|
||||
Regex uesd to match those: `^([0-9.]+)([EPTGMK]i?|[EPTGMK]?|e[0-9]+)$`
|
||||
You can try live [here](https://regex101.com/r/TUkZhN/1)
|
||||
Regex uesd to match those: `^(?!^0(e[0-9]|[EPTGMK]i?|)$)([0-9]+)(|[EPTGMK]i?|e[0-9]+)$`
|
||||
You can try live [here](https://regex101.com/r/LyDc6u/1)
|
||||
More detailed info can be found [here](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory)
|
||||
|
||||
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
schema:
|
||||
type: string
|
||||
default: "4000m"
|
||||
valid_chars: '^([0-9]+)(\.[0-9]?|m?)$'
|
||||
valid_chars: '^(?!^0(\.0|m|)$)([0-9]+)(\.[0-9]|m?)$'
|
||||
- variable: memory
|
||||
label: "Memory RAM"
|
||||
schema:
|
||||
type: string
|
||||
default: "8Gi"
|
||||
valid_chars: '^([0-9.]+)([EPTGMK]i?|[EPTGMK]?|e[0-9]+)$'
|
||||
valid_chars: '^(?!^0(e[0-9]|[EPTGMK]i?|)$)([0-9]+)(|[EPTGMK]i?|e[0-9]+)$'
|
||||
- variable: requests
|
||||
label: "Advanced Request minimum resources required"
|
||||
schema:
|
||||
|
@ -31,10 +31,10 @@
|
|||
schema:
|
||||
type: string
|
||||
default: "10m"
|
||||
valid_chars: '^([0-9]+)(\.[0-9]?|m?)$'
|
||||
valid_chars: '^(?!^0(\.0|m|)$)([0-9]+)(\.[0-9]|m?)$'
|
||||
- variable: memory
|
||||
label: "Memory RAM"
|
||||
schema:
|
||||
type: string
|
||||
default: "50Mi"
|
||||
valid_chars: '^([0-9.]+)([EPTGMK]i?|[EPTGMK]?|e[0-9]+)$'
|
||||
valid_chars: '^(?!^0(e[0-9]|[EPTGMK]i?|)$)([0-9]+)(|[EPTGMK]i?|e[0-9]+)$'
|
||||
|
|
Loading…
Reference in New Issue