Merge branch 'fix-thanos-values' into 'master'

fix thanos values for minio logic

See merge request !5093

(cherry picked from commit 0b8e47fc)

b154014d fix thanos values for minio logic

Co-authored-by: Christopher O'Connell <coconnell@bridgephase.com>

chart/templates/thanos/values.yaml

@@ -42,7 +42,7 @@ istio:
     - istio-system/{{ default "public" .Values.addons.thanos.ingress.gateway }}
 
 {{- with .Values.addons.thanos.objectStorage }}
-{{- if or $.Values.addons.thanos.values.minio.enabled (and (eq $.Values.addons.thanos.strategy "scalable") (not (and .endpoint .region))) }}
+{{- if and (eq $.Values.addons.thanos.strategy "scalable") (not (and .endpoint .region)) }}
 minio:
   enabled: true
 {{- end }}