From 4604a1da62bd319aef35660fe7991770118d4df5 Mon Sep 17 00:00:00 2001 From: ssube Date: Sat, 15 Jun 2019 20:53:20 -0500 Subject: [PATCH] rules(kubernetes): allow numeric resources, validate string resources more thoroughly --- rules/kubernetes.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rules/kubernetes.yml b/rules/kubernetes.yml index 77fe418..f7cd042 100644 --- a/rules/kubernetes.yml +++ b/rules/kubernetes.yml @@ -23,18 +23,22 @@ rules: type: object required: [cpu, memory] properties: - cpu: - type: string - memory: - type: string + cpu: &resources-cpu + oneOf: + - type: number + - type: string + pattern: "[1-9][0-9]*m" + memory: &resources-memory + oneOf: + - type: number + - type: string + pattern: "[1-9][0-9]*[KMG]i" requests: type: object required: [cpu, memory] properties: - cpu: - type: string - memory: - type: string + cpu: *resources-cpu + memory: *resources-memory - name: kubernetes-resources-minimum-cpu desc: resource limits are too low @@ -61,4 +65,4 @@ rules: properties: cpu: type: string - pattern: "[0-9]{3}m" + pattern: "[0-9]{3}m" \ No newline at end of file