CH-245 fix default resources assignment

Author: filippomc

deployment-configuration/helm/templates/_helpers.tpl

@@ -1,5 +1,29 @@
 {{/* vim: set filetype=mustache: */}}
 
+{{/*
+Render resources block for deployment, omitting limits if not set
+Usage: {{ include "deploy_utils.resources" .app.harness.deployment.resources }}
+*/}}
+{{- define "deploy_utils.resources" -}}
+resources:
+  requests:
+    {{- if .requests.memory }}
+    memory: {{ .requests.memory }}
+    {{- end }}
+    {{- if .requests.cpu }}
+    cpu: {{ .requests.cpu }}
+    {{- end }}
+  {{- if or .limits.memory .limits.cpu }}
+  limits:
+    {{- if .limits.memory }}
+    memory: {{ .limits.memory }}
+    {{- end }}
+    {{- if .limits.cpu }}
+    cpu: {{ .limits.cpu }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

deployment-configuration/helm/templates/auto-database.yaml

@@ -8,9 +8,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.backup.volumesize }}
+  {{ include "deploy_utils.resources" .Values.backup.resources }}
 ---
 {{- end }}
 {{- define "deploy_utils.database" }}
@@ -22,9 +20,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .app.harness.database.size }}
+  {{ include "deploy_utils.resources" .app.harness.database.resources }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -65,13 +61,7 @@ spec:
         - name: {{ $port.name }}
           containerPort: {{ $port.port }}
         {{- end }}
-        resources:
-          requests:
-            memory: {{ .app.harness.database.resources.requests.memory | default "32Mi" }}
-            cpu: {{ .app.harness.database.resources.requests.cpu | default "25m" }}
-          limits:
-            memory: {{ .app.harness.database.resources.limits.memory | default "64Mi" }}
-            cpu: {{ .app.harness.database.resources.limits.cpu | default "50m" }}
+        {{ include "deploy_utils.resources" .app.harness.database.resources }}
         volumeMounts:
           - name: {{ .app.harness.database.name | quote }}
             mountPath: /data/db

deployment-configuration/helm/templates/auto-deployments.yaml

@@ -102,11 +102,7 @@ spec:
           - containerPort: {{ .app.harness.deployment.port | default 8080 }}
         resources:
           requests:
-            memory: {{ .app.harness.deployment.resources.requests.memory | default "32Mi" }}
-            cpu: {{ .app.harness.deployment.resources.requests.cpu | default "25m" }}
-          limits:
-            memory: {{ .app.harness.deployment.resources.limits.memory | default "64Mi" }}
-            cpu: {{ .app.harness.deployment.resources.limits.cpu | default "50m" }}
+          {{ include "deploy_utils.resources" .app.harness.deployment.resources }}
 
         volumeMounts:
           - name: cloudharness-allvalues