Enforce default CPU resource settings

imgproxy · Oct 20, 2021 · 51b4a39 · 51b4a39
1 parent 8dc84e4
commit 51b4a39
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.5 (2021-10-20)
+
+* Enforce default CPU resource settings
+
 ## 0.8.4 (2021-10-07)
 
 * Support imgproxy v3.0.0.beta1

diff --git a/imgproxy/Chart.yaml b/imgproxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A fast and secure standalone server for resizing and converting remote images. The main principles of imgproxy are simplicity, speed, and security.
 name: imgproxy
 icon: https://cdn.rawgit.com/imgproxy/imgproxy/master/logo.svg
-version: 0.8.4
+version: 0.8.5
 appVersion: 3.0.0.beta1
 keywords:
   - imgproxy

diff --git a/imgproxy/templates/_helpers.tpl b/imgproxy/templates/_helpers.tpl
@@ -86,3 +86,19 @@ https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.ht
 {{- .existingClaim | default .name | print }}
 {{- end -}}
 {{- end -}}
+
+{{/* Builds the resources claim for the deployment */}}
+{{- define "imgproxy.podResources" -}}
+
+{{- $default := dict -}}
+{{- with $.Values.resources.deployment.replicas | default dict -}}
+{{- $minCount := .minCount | default 1 | int }}
+{{- $maxCount := .maxCount | default $minCount | int }}
+{{- if gt $maxCount $minCount -}}
+{{- $default = dict "requests" (dict "cpu" 1) "limits" (dict "cpu" 1) -}}
+{{- end -}}
+{{- end -}}
+
+{{- $custom := $.Values.resources.deployment.resources | default dict -}}
+{{- merge $custom $default | toYaml -}}
+{{- end -}}
diff --git a/imgproxy/templates/deployment.yaml b/imgproxy/templates/deployment.yaml
@@ -62,9 +62,7 @@ spec:
             - secretRef:
                 name: {{ $secretName }}
             {{- end }}
-          {{- if .Values.resources.deployment.resources }}
-          resources: {{ .Values.resources.deployment.resources | toYaml | nindent 16 }}
-          {{- end }}
+          resources: {{ include "imgproxy.podResources" $ | nindent 12 }}
           {{- if .Values.persistence.enabled }}
           volumeMounts:
             - name: data

diff --git a/imgproxy/values.yaml b/imgproxy/values.yaml
@@ -95,7 +95,8 @@ resources:
     # Toleration for K8s taints
     tolerations: []
 
-    # Set kubernetes specific resource limits
+    # Set kubernetes specific resource limits.
+    # We claim `cpu: 1` for both limits and requests by default.
     resources: {}
     # limits:
     #   cpu: 700m