Skip to content

Commit 8101ee4

Browse files
author
Alan Christie
committed
Refined memory schema (4Mi to 99Gi)
1 parent 8c1fd63 commit 8101ee4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

decoder/schema.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,11 @@ definitions:
149149
maximum: 32
150150

151151
# A kubernetes memory declaration.
152-
# Here we only accept between 1 and 4 numbers
153-
# and force a restricted suffix (Mi or Gi)
152+
# Here we allow a 4-digit Mi value (minimum of 4Mi)
153+
# or a 2-digit Gi value (minimum of 1G).
154154
memory:
155155
type: string
156-
minLength: 1
157-
pattern: '^[1-9][0-9]{0,3}(Gi|Mi)$'
156+
pattern: '^(([4-9]|[1-9][0-9]{1,3})Mi|[1-9][0-9]{0,1}Gi)$'
158157

159158
# Image environment definitions.
160159
environment:

tests/test_validate_job_schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ def test_validate_image_memory_32gi():
9898
assert error is None
9999

100100

101-
def test_validate_image_memory_500Mi():
101+
def test_validate_image_memory_4mi():
102102
# Arrange
103103
text: Dict[str, Any] = deepcopy(_MINIMAL)
104104
demo_job: Dict[str, Any] = text['jobs']['demo']
105-
demo_job['image']['memory'] = '500Mi'
105+
demo_job['image']['memory'] = '4Mi'
106106

107107
# Act
108108
error = decoder.validate_job_schema(text)

0 commit comments

Comments
 (0)