Merge branch 'fix-worker-resources' into 'main'

overwrite resources in deploymentconfig template

See merge request !40

{{cookiecutter.project_slug}}/templates/{{cookiecutter.template_base_name}}/helpers/workers/_default_resources.tpl

@@ -2,11 +2,11 @@
 {%- raw %}
 {{- define "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.defaultWorkerResources" -}}
 limits:
-  cpu: {{ .resources.limits.cpu | default "200m" | quote }} 
-  memory: {{ .resources.limits.memory | default "200Mi" | quote }} 
+  cpu: "200m"
+  memory: "200Mi"
 requests:
-  cpu: {{ .resources.requests.cpu | default "50m" | quote }} 
-  memory: {{ .resources.requests.memory | default "50Mi" | quote }} 
+  cpu: "50m"
+  memory: "50Mi"
 {{- end }}
 {%- endraw %}
 {%- endif %}
\ No newline at end of file

{{cookiecutter.project_slug}}/templates/{{cookiecutter.template_base_name}}/worker-deploymentconfigs.yaml

@@ -29,7 +29,8 @@ spec:
         memory: 20Mi
     type: {% raw %}{{ $data.deploymentStrategy | default $.Values.deploymentStrategy }}{%- endraw %}
   {%- raw %}
-  {{- $resources := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.defaultWorkerResources" $data | fromYaml }}
+  {{- $defaultResources := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.defaultWorkerResources" $data | fromYaml }}
+  {{- $resources := mustMergeOverwrite ($defaultResources) ($data.resources | default (dict)) }}
   {{- $podValues := mustMergeOverwrite (deepCopy $.Values) (dict "resources" $resources) $options (dict "baseName" $name) {% endraw %}{%- if cookiecutter.include_secret =="yes" %}{% raw %}(dict "secretName" ($.Values.secretName | default $.Values.baseName)) {% endraw %}{% endif %} {%- if cookiecutter.include_configmap =="yes" %}{% raw %}(dict "configMapName" ($.Values.configMapName | default $.Values.baseName)){% endraw %}{% endif %}{% raw %} }}
   {{- $podData := dict "Values" $podValues "Release" $.Release "Chart" $.Chart }}
   {%- endraw %}

{{cookiecutter.project_slug}}/templates/{{cookiecutter.template_base_name}}/worker-deployments.yaml

@@ -23,7 +23,8 @@ spec:
   strategy:
     type: {% raw %}{{ $data.deploymentStrategy | default $.Values.deploymentStrategy }}{%- endraw %}
   {%- raw %}
-  {{- $resources := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.defaultWorkerResources" $data | fromYaml }}
+  {{- $defaultResources := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.defaultWorkerResources" $data | fromYaml }}
+  {{- $resources := mustMergeOverwrite ($defaultResources) ($data.resources | default (dict)) }}
   {{- $podValues := mustMergeOverwrite (deepCopy $.Values) (dict "resources" $resources) $options (dict "baseName" $name) {% endraw %}{%- if cookiecutter.include_secret =="yes" %}{% raw %}(dict "secretName" ($.Values.secretName | default $.Values.baseName)) {% endraw %}{% endif %} {%- if cookiecutter.include_configmap =="yes" %}{% raw %}(dict "configMapName" ($.Values.configMapName | default $.Values.baseName)){% endraw %}{% endif %}{% raw %} }}
   {{- $podData := dict "Values" $podValues "Release" $.Release "Chart" $.Chart }}
   {%- endraw %}