Fixes github issue 1070: Helm chart not applying resources.limits.memory to operator's deployment

Co-authored-by: Etienne Divet <[email protected]>

Author: shashank-netapp

helm/trident-operator/templates/_helpers.tpl

@@ -379,3 +379,38 @@ Helper functions to check if resources are actually defined (not just empty stru
   {{- end -}}
   {{- if $hasResources -}}true{{- end -}}
 {{- end -}}
+
+{{/*
+Helper function to check if operator resources are defined
+*/}}
+{{- define "trident-operator.hasResources" -}}
+  {{- $val := . -}}
+  {{- if or $val.requests.cpu $val.requests.memory $val.limits.cpu $val.limits.memory -}}
+    true
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Helper function to render resource requests and limits for the operator
+*/}}
+{{- define "trident-operator.resources" }}
+{{- $val := .}}
+{{- if or $val.requests.cpu $val.requests.memory }}
+requests:
+{{- if $val.requests.cpu }}
+  cpu: {{ $val.requests.cpu }}
+{{- end }}
+{{- if $val.requests.memory }}
+  memory: {{ $val.requests.memory }}
+{{- end }}
+{{- end }}
+{{- if or $val.limits.cpu $val.limits.memory }}
+limits:
+{{- if $val.limits.cpu }}
+  cpu: {{ $val.limits.cpu }}
+{{- end }}
+{{- if $val.limits.memory }}
+  memory: {{ $val.limits.memory }}
+{{- end }}
+{{- end }}
+{{- end -}}

helm/trident-operator/templates/deployment.yaml

@@ -69,15 +69,10 @@ spec:
         image: {{ include "trident-operator.image" $ }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         name: trident-operator
+        {{- if (include "trident-operator.hasResources" .Values.resources.operator) }}
         resources:
-          requests:
-            cpu: {{ .Values.resources.operator.requests.cpu }}
-            memory: {{ .Values.resources.operator.requests.memory }}
-          {{- if .Values.resources.operator.limits.cpu }}
-          limits:
-            cpu: {{ .Values.resources.operator.limits.cpu }}
-            memory: {{ .Values.resources.operator.limits.memory }}
-          {{- end }}
+          {{- include "trident-operator.resources" .Values.resources.operator | indent 10 }}
+        {{- end }}
       {{- if and (eq .Values.cloudProvider "Azure") (eq .Values.cloudIdentity "") }}
       volumes:
       - name: azure-cred