[kube-prometheus-stack] Avoid nil pointer error with empty thanos con…

…fig (prometheus-community#4132) * fix(kps): Avoid nil pointer error with empty thanos config Signed-off-by: Grace Do <[email protected]> * fix(kps): Wrap thanos.objectStorageConfig nullable level in missed if else Signed-off-by: Grace Do <[email protected]> * feat(kps): Bump chart version Signed-off-by: Grace Do <[email protected]> --------- Signed-off-by: Grace Do <[email protected]>
jkroepke · Jan 12, 2024 · 996078e · 996078e
1 parent c1f69b1
commit 996078e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 55.8.0
+version: 55.8.1
 appVersion: v0.70.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -359,11 +359,11 @@ spec:
 {{- with (omit .Values.prometheus.prometheusSpec.thanos "objectStorageConfig")}}
 {{ toYaml . | indent 4 }}
 {{- end }}
-{{- if .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret }}
+{{- if ((.Values.prometheus.prometheusSpec.thanos.objectStorageConfig).existingSecret) }}
     objectStorageConfig:
       key: "{{.Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret.key }}"
       name: "{{.Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret.name }}"
-{{- else if .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.secret}}
+{{- else if ((.Values.prometheus.prometheusSpec.thanos.objectStorageConfig).secret) }}
     objectStorageConfig:
       key: object-storage-configs.yaml
       name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus