Helm Unit: Fixed connect-inject deployment for cpu limit null update

Author: natemollica-nm

charts/consul/templates/connect-inject-deployment.yaml

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

charts/consul/test/unit/connect-inject-deployment.bats

@@ -960,7 +960,7 @@ load _helpers
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -rc '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
-  [ "${actual}" = '{"limits":{"cpu":null,"memory":"200Mi"},"requests":{"cpu":"50m","memory":"200Mi"}}' ]
+  [ "${actual}" = '{"requests":{"cpu":"50m","memory":"200Mi"},"limits":{"memory":"200Mi"}}' ]
 }
 
 @test "connectInject/Deployment: can set resources" {
@@ -974,7 +974,7 @@ load _helpers
       --set 'connectInject.resources.limits.cpu=200m' \
       . | tee /dev/stderr |
       yq -rc '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
-  [ "${actual}" = '{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}' ]
+  [ "${actual}" = '{"requests":{"cpu":"100m","memory":"100Mi"},"limits":{"cpu":"200m","memory":"200Mi"}}' ]
 }
 
 #--------------------------------------------------------------------