fix: cater for all three permutations

prometheus-community · Oct 23, 2023 · 193540a · 193540a
1 parent fefadd4
commit 193540a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -356,7 +356,9 @@ spec:
 {{- if not .Values.prometheus.agentMode }}
 {{- if .Values.prometheus.prometheusSpec.thanos }}
   thanos:
-{{- omit .Values.prometheus.prometheusSpec.thanos "objectStorageConfig" | toYaml | indent 4 }}
+{{- with (omit .Values.prometheus.prometheusSpec.thanos "objectStorageConfig")}}
+{{ toYaml . | indent 4 }}
+{{- end }}
 {{- if .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret }}
     objectStorageConfig:
       key: "{{.Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret.key }}"

diff --git a/charts/kube-prometheus-stack/templates/prometheus/secret.yaml b/charts/kube-prometheus-stack/templates/prometheus/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.thanosRuler.enabled }}
+{{- if .Values.prometheus.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/component: prometheus
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
 data:
-  {{- with .Values.prometheusspec.thanos.objectStorageConfig }}
+  {{- with .Values.prometheus.prometheusSpec.thanos.objectStorageConfig }}
   {{- if and .secret (not .existingSecret) }}
   object-storage-configs.yaml: {{ toYaml .secret | b64enc | quote }}
   {{- end }}