Merge pull request #34178 from alex-hunt-materialize/fix_swap_enabled_overrides

fix swap_enabled overrides

Author: alex-hunt-materialize

misc/helm-charts/operator/templates/_helpers.tpl

@@ -114,11 +114,11 @@ Helper template to process cluster sizes based on storage class configuration
             {{- $_ := set $newConfig "disk_limit" "0" }}
         {{- end }}
 
-        {{- if and ($.Values.operator.clusters.swap_enabled) (not (index $newConfig "swap_enabled")) }}
-            {{- $_ := set $newConfig "swap_enabled" true }}
+        {{- if not (hasKey $newConfig "swap_enabled") }}
+            {{- $_ := set $newConfig "swap_enabled" $.Values.operator.clusters.swap_enabled }}
         {{- end }}
 
-        {{- if (not (index $newConfig "selectors")) }}
+        {{- if (not (hasKey $newConfig "selectors")) }}
             {{- $_ := set $newConfig "selectors" dict }}
         {{- end }}
         {{- if $newConfig.swap_enabled }}

misc/helm-charts/operator/tests/deployment_test.yaml

@@ -97,6 +97,28 @@ tests:
       path: spec.template.spec.containers[0].args[13]
       pattern: materialize.cloud/swap":"true"
 
+- it: should handle default of swap_enabled, but some sizes without
+  set:
+    operator.clusters.sizes.mysize:
+      swap_enabled: false
+      workers: 1
+      scale: 1
+      cpu_exclusive: false
+      cpu_limit: 0.1
+      credits_per_hour: "0.00"
+      disk_limit: "1552MiB"
+      memory_limit: "776MiB"
+  asserts:
+  - matchRegex:
+      path: spec.template.spec.containers[0].args[13]
+      pattern: '"mysize":{"cpu_exclusive":false,"cpu_limit":0.1,"credits_per_hour":"0.00","disk_limit":"0","is_cc":true,"memory_limit":"776MiB","scale":1,"selectors":{},"swap_enabled":false,"workers":1}'
+  - matchRegex:
+      path: spec.template.spec.containers[0].args[13]
+      pattern: swap_enabled":true
+  - matchRegex:
+      path: spec.template.spec.containers[0].args[13]
+      pattern: materialize.cloud/swap":"true"
+
 - it: should configure for AWS provider correctly
   set:
     operator.cloudProvider.type: "aws"