Do not provide defaults for resources req/lim (prometheus-community#30)

nf-npieros · Nov 23, 2019 · 47a93a4 · 47a93a4
1 parent 13e1db4
commit 47a93a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -31,18 +31,16 @@ spec:
       - image: {{ .Values.image.name }}:{{ .Values.image.tag }}
         name: {{ template "traefik.fullname" . }}
         resources:
-        {{- if .Values.yaml }}
-        {{- if .Values.yaml.resources }}
-{{ toYaml .Values.yaml.resources | indent 10 }}
-        {{- end }}
-        {{- if .Values.yaml.tolerations }}
+          {{- with .Values.resources }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+        {{- with .Values.tolerations }}
         tolerations:
-{{ toYaml .Values.yaml.tolerations | indent 8 }}
+          {{- toYaml . | nindent 10 }}
         {{- end }}
-        {{- if .Values.yaml.nodeSelector }}
+        {{- with .Values.nodeSelector }}
         nodeSelector:
-{{ toYaml .Values.yaml.nodeSelector | indent 10 }}
-        {{- end }}
+          {{- toYaml . | nindent 10 }}
         {{- end }}
         readinessProbe:
           httpGet:

diff --git a/values.yaml b/values.yaml
@@ -47,13 +47,12 @@ dashboard:
 logs:
   loglevel: WARN
 #
-yaml:
-  resources:
-    requests:
-      cpu: "100m"
-      memory: "50Mi"
-    limits:
-      cpu: "300m"
-      memory: "150Mi"
-#  nodeSelector: {}
-#  tolerations: []
+resources: {}
+  # requests:
+  #   cpu: "100m"
+  #   memory: "50Mi"
+  # limits:
+  #   cpu: "300m"
+  #   memory: "150Mi"
+nodeSelector: {}
+tolerations: []