Fix Kubernetes memory not accepting decimal values (#568)

bakdata · Dec 17, 2024 · eeb0b27 · eeb0b27
1 parent e6e2ae4
commit eeb0b27
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/docs/docs/schema/defaults.json b/docs/docs/schema/defaults.json
@@ -2342,7 +2342,7 @@
                 "memory": {
                     "anyOf": [
                         {
-                            "pattern": "^\\d+([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$",
+                            "pattern": "^\\d+(\\.\\d+)?([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$",
                             "type": "string"
                         },
                         {

diff --git a/docs/docs/schema/pipeline.json b/docs/docs/schema/pipeline.json
@@ -2002,7 +2002,7 @@
                 "memory": {
                     "anyOf": [
                         {
-                            "pattern": "^\\d+([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$",
+                            "pattern": "^\\d+(\\.\\d+)?([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$",
                             "type": "string"
                         },
                         {

diff --git a/kpops/components/common/kubernetes_model.py b/kpops/components/common/kubernetes_model.py
@@ -349,7 +349,8 @@ class Toleration(DescConfigModel, CamelCaseConfigModel):
 CPUStr = Annotated[str, pydantic.StringConstraints(pattern=r"^\d+m$")]
 MemoryStr = Annotated[
     # Matches plain number string or number with valid suffixes: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory
-    str, pydantic.StringConstraints(pattern=r"^\d+([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$")
+    str,
+    pydantic.StringConstraints(pattern=r"^\d+(\.\d+)?([EPTGMk]|Ei|Pi|Ti|Gi|Mi|Ki)?$"),
 ]
 
 

diff --git a/tests/components/streams_bootstrap/test_streams_bootstrap.py b/tests/components/streams_bootstrap/test_streams_bootstrap.py
@@ -160,6 +160,14 @@ async def test_should_raise_validation_error_for_invalid_helm_chart_version(self
             pytest.param(
                 {"memory": "10Mi"}, does_not_raise(), id="memory str mebibyte"
             ),
+            pytest.param(
+                {"memory": "2.5G"}, does_not_raise(), id="memory str decimal gigabyte"
+            ),
+            pytest.param(
+                {"memory": "0.599M"},
+                does_not_raise(),
+                id="memory str decimal megabyte",
+            ),
             pytest.param(
                 {"memory": 0},
                 pytest.raises(ValidationError),