Merge pull request #139 from erulabs/patch-1

Use mergeOverwrite to allow overriding limits.cpu with null
imgproxy · Jul 25, 2023 · f2ad7c7 · f2ad7c7
2 parents 150b536 + af22b72
commit f2ad7c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/imgproxy/templates/_helpers.tpl b/imgproxy/templates/_helpers.tpl
@@ -101,7 +101,7 @@ https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.ht
 {{- end -}}
 
 {{- $custom := $.Values.resources.deployment.resources | default dict -}}
-{{- merge $custom $default | toYaml -}}
+{{- mergeOverwrite $default $custom | toYaml -}}
 {{- end -}}
 
 {{/* Combine ingress path from server.pathPrefix and ingress.pathSuffix */}}