From 09daf199ae6bf182205a8ff7124b15f0ea7eb7bf Mon Sep 17 00:00:00 2001 From: machine424 Date: Wed, 9 Oct 2019 18:53:51 +0200 Subject: [PATCH] [stable/kube-state-metrics] Avoid spec.template.spec.containers.0.resources with null value (#17817) Signed-off-by: ayoub mrini --- stable/kube-state-metrics/Chart.yaml | 2 +- stable/kube-state-metrics/templates/deployment.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml index f1f4693692..283e1ac6db 100644 --- a/stable/kube-state-metrics/Chart.yaml +++ b/stable/kube-state-metrics/Chart.yaml @@ -6,7 +6,7 @@ keywords: - monitoring - prometheus - kubernetes -version: 2.4.0 +version: 2.4.1 appVersion: 1.8.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml index 7e77550214..492df24413 100644 --- a/stable/kube-state-metrics/templates/deployment.yaml +++ b/stable/kube-state-metrics/templates/deployment.yaml @@ -132,9 +132,10 @@ spec: port: 8080 initialDelaySeconds: 5 timeoutSeconds: 5 - +{{- if .Values.resources }} resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml .Values.resources | indent 10 }} +{{- end }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }}