Helm Unit: Corrected resource string vs int handling + quote handling

Author: natemollica-nm

charts/consul/templates/mesh-gateway-deployment.yaml

@@ -214,20 +214,20 @@ spec:
           {{- if .Values.meshGateway.resources.requests }}
           requests:
             {{- if .Values.meshGateway.resources.requests.cpu }}
-            cpu: "{{ .Values.meshGateway.resources.requests.cpu }}"
+            cpu: {{ .Values.meshGateway.resources.requests.cpu | toString | trim }}
             {{- end }}
             {{- if .Values.meshGateway.resources.requests.memory }}
-            memory: "{{ .Values.meshGateway.resources.requests.memory }}"
+            memory: {{ .Values.meshGateway.resources.requests.memory | toString | trim }}
             {{- end }}
           {{- end }}
 
           {{- if .Values.meshGateway.resources.limits }}
           limits:
             {{- if .Values.meshGateway.resources.limits.cpu }}
-            cpu: "{{ .Values.meshGateway.resources.limits.cpu }}"
+            cpu: {{ .Values.meshGateway.resources.limits.cpu | toString | trim }}
             {{- end }}
             {{- if .Values.meshGateway.resources.limits.memory }}
-            memory: "{{ .Values.meshGateway.resources.limits.memory }}"
+            memory: {{ .Values.meshGateway.resources.limits.memory | toString | trim }}
             {{- end }}
           {{- end }}
         {{- end }}

charts/consul/templates/server-statefulset.yaml

@@ -660,20 +660,20 @@ spec:
             {{- if .Values.server.resources.requests }}
             requests:
               {{- if .Values.server.resources.requests.cpu }}
-              cpu: "{{ .Values.server.resources.requests.cpu }}"
+              cpu: {{ .Values.server.resources.requests.cpu | toString | trim }}
               {{- end }}
               {{- if .Values.server.resources.requests.memory }}
-              memory: "{{ .Values.server.resources.requests.memory }}"
+              memory: {{ .Values.server.resources.requests.memory | toString | trim }}
               {{- end }}
             {{- end }}
 
             {{- if .Values.server.resources.limits }}
             limits:
               {{- if .Values.server.resources.limits.cpu }}
-              cpu: "{{ .Values.server.resources.limits.cpu }}"
+              cpu: {{ .Values.server.resources.limits.cpu | toString | trim }}
               {{- end }}
               {{- if .Values.server.resources.limits.memory }}
-              memory: "{{ .Values.server.resources.limits.memory }}"
+              memory: {{ .Values.server.resources.limits.memory | toString | trim }}
               {{- end }}
             {{- end }}
           {{- end }}

charts/consul/test/unit/mesh-gateway-deployment.bats

@@ -354,10 +354,10 @@ key2: value2' \
       -s templates/mesh-gateway-deployment.yaml  \
       --set 'meshGateway.enabled=true' \
       --set 'connectInject.enabled=true' \
-      --set 'meshGateway.resources.foo=bar' \
+      --set 'meshGateway.resources.limits.cpu=4' \
       . | tee /dev/stderr |
-      yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)
-  [ "${actual}" = "bar" ]
+      yq -r '.spec.template.spec.containers[0].resources.limits.cpu' | tee /dev/stderr)
+  [ "${actual}" = 4 ]
 }
 
 # Test support for the deprecated method of setting a YAML string.
@@ -368,10 +368,10 @@ key2: value2' \
       --set 'meshGateway.enabled=true' \
       --set 'connectInject.enabled=true' \
       --set 'client.grpc=true' \
-      --set 'meshGateway.resources=foo: bar' \
+      --set 'meshGateway.resources.limits.cpu="2000m"' \
       . | tee /dev/stderr |
-      yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)
-  [ "${actual}" = "bar" ]
+      yq -r '.spec.template.spec.containers[0].resources.limits.cpu' | tee /dev/stderr)
+  [ "${actual}" = "2000m" ]
 }
 
 #--------------------------------------------------------------------

charts/consul/test/unit/server-statefulset.bats

@@ -99,28 +99,28 @@ load _helpers
       -s templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -rc '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
-  [ "${actual}" = '{"limits":{"cpu":null,"memory":"200Mi"},"requests":{"cpu":"100m","memory":"200Mi"}}' ]
+  [ "${actual}" = '{"requests":{"cpu":"100m","memory":"200Mi"},"limits":{"memory":"200Mi"}}' ]
 }
 
 @test "server/StatefulSet: resources can be overridden" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/server-statefulset.yaml  \
-      --set 'server.resources.foo=bar' \
+      --set 'server.resources.limits.cpu=4' \
       . | tee /dev/stderr |
-      yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)
-  [ "${actual}" = "bar" ]
+      yq -r '.spec.template.spec.containers[0].resources.limits.cpu' | tee /dev/stderr)
+  [ "${actual}" = 4 ]
 }
 
 # Test support for the deprecated method of setting a YAML string.
 @test "server/StatefulSet: resources can be overridden with string" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/server-statefulset.yaml  \
-      --set 'server.resources=foo: bar' \
+      --set 'server.resources.limits.cpu="2000m"' \
       . | tee /dev/stderr |
-      yq -r '.spec.template.spec.containers[0].resources.foo' | tee /dev/stderr)
-  [ "${actual}" = "bar" ]
+      yq -r '.spec.template.spec.containers[0].resources.limits.cpu' | tee /dev/stderr)
+  [ "${actual}" = "2000m" ]
 }
 
 #--------------------------------------------------------------------