From 8386532962d2ef749166c8a6461fd27306bbacd8 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Sat, 4 Apr 2020 02:07:46 -0700 Subject: [PATCH] [stable/prometheus-operator] Use disableCompaction value (#21462) * [stable/prometheus-operator] Use disableCompaction value Signed-off-by: Grace Do * [stable/prometheus-operator] Bump chart version Signed-off-by: Grace Do --- stable/prometheus-operator/Chart.yaml | 2 +- .../prometheus-operator/templates/prometheus/prometheus.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 4cef0318b5..23d66146a5 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.12.7 +version: 8.12.8 appVersion: 0.37.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index 34189310a3..3a0974d498 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -226,9 +226,12 @@ spec: {{- if .Values.prometheus.prometheusSpec.thanos }} thanos: {{ toYaml .Values.prometheus.prometheusSpec.thanos | indent 4 }} +{{- end }} +{{- if .Values.prometheus.prometheusSpec.disableCompaction }} + disableCompaction: {{ .Values.prometheus.prometheusSpec.disableCompaction }} {{- end }} portName: {{ .Values.prometheus.prometheusSpec.portName }} {{- end }} {{- if .Values.prometheus.prometheusSpec.enforcedNamespaceLabel }} enforcedNamespaceLabel: {{ .Values.prometheus.prometheusSpec.enforcedNamespaceLabel }} -{{- end }} \ No newline at end of file +{{- end }}