From b2743859810fb3b6de84f2e05901ff19acbbedf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCllner?= Date: Thu, 21 Sep 2023 07:26:20 +0200 Subject: [PATCH] [kube-prometheus-stack] use default value instead of if in prometheus operator deployment template (#3812) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Markus Müllner --- .../prometheus-operator/deployment.yaml | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index 5d2d16ba58ad..67d0024d1428 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -91,26 +91,10 @@ spec: {{- else }} - --prometheus-config-reloader={{ $configReloaderRegistry }}/{{ .Values.prometheusOperator.prometheusConfigReloader.image.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloader.image.tag | default .Chart.AppVersion }} {{- end }} - {{- if (((.Values.prometheusOperator.prometheusConfigReloader.resources).requests).cpu) }} - - --config-reloader-cpu-request={{ .Values.prometheusOperator.prometheusConfigReloader.resources.requests.cpu }} - {{- else }} - - --config-reloader-cpu-request=0 - {{- end }} - {{- if (((.Values.prometheusOperator.prometheusConfigReloader.resources).limits).cpu) }} - - --config-reloader-cpu-limit={{ .Values.prometheusOperator.prometheusConfigReloader.resources.limits.cpu }} - {{- else }} - - --config-reloader-cpu-limit=0 - {{- end }} - {{- if (((.Values.prometheusOperator.prometheusConfigReloader.resources).requests).memory) }} - - --config-reloader-memory-request={{ .Values.prometheusOperator.prometheusConfigReloader.resources.requests.memory }} - {{- else }} - - --config-reloader-memory-request=0 - {{- end }} - {{- if (((.Values.prometheusOperator.prometheusConfigReloader.resources).limits).memory) }} - - --config-reloader-memory-limit={{ .Values.prometheusOperator.prometheusConfigReloader.resources.limits.memory }} - {{- else }} - - --config-reloader-memory-limit=0 - {{- end }} + - --config-reloader-cpu-request={{ (((.Values.prometheusOperator.prometheusConfigReloader.resources).requests).cpu) | default 0 }} + - --config-reloader-cpu-limit={{ (((.Values.prometheusOperator.prometheusConfigReloader.resources).limits).cpu) | default 0 }} + - --config-reloader-memory-request={{ (((.Values.prometheusOperator.prometheusConfigReloader.resources).requests).memory) | default 0 }} + - --config-reloader-memory-limit={{ (((.Values.prometheusOperator.prometheusConfigReloader.resources).limits).memory) | default 0 }} {{- if .Values.prometheusOperator.prometheusConfigReloader.enableProbe }} - --enable-config-reloader-probes=true {{- end }}