From 290516d785df18e68448c315429b678ac3ef4bed Mon Sep 17 00:00:00 2001
From: zeritti <47476160+zeritti@users.noreply.github.com>
Date: Mon, 8 May 2023 12:01:41 +0000
Subject: [PATCH] [prometheus] Fix volume name evaluation (#3348)

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
---
 charts/prometheus/Chart.yaml         | 2 +-
 charts/prometheus/templates/sts.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
index 67f8baf92b0f..9420b4905dae 100644
--- a/charts/prometheus/Chart.yaml
+++ b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.43.1
-version: 22.4.0
+version: 22.4.1
 kubeVersion: ">=1.16.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
diff --git a/charts/prometheus/templates/sts.yaml b/charts/prometheus/templates/sts.yaml
index bc5743661352..623ec811533a 100644
--- a/charts/prometheus/templates/sts.yaml
+++ b/charts/prometheus/templates/sts.yaml
@@ -211,7 +211,7 @@ spec:
           volumeMounts:
             - name: config-volume
               mountPath: /etc/config
-            - name: {{ ternary .Values.server.persistentVolume.statefulSetNameOverride "storage-volume" (and .Values.server.persistentVolume.enabled .Values.server.persistentVolume.statefulSetNameOverride) }}
+            - name: {{ ternary .Values.server.persistentVolume.statefulSetNameOverride "storage-volume" (and .Values.server.persistentVolume.enabled (not (empty .Values.server.persistentVolume.statefulSetNameOverride))) }}
               mountPath: {{ .Values.server.persistentVolume.mountPath }}
               subPath: "{{ .Values.server.persistentVolume.subPath }}"
           {{- range .Values.server.extraHostPathMounts }}