Merge branch...

Merge branch '1473-unable-to-disable-minio-when-loki-strategy-is-set-to-scalable-and-not-setting-values-for-both' into 'master'

change the helm dependency logic to only include minio-operator if minio (tenant) is enabled

Closes #1473

See merge request !5733

chart/templates/loki/helmrelease.yaml

@@ -82,11 +82,9 @@ spec:
     - name: kyverno-policies
       namespace: {{ .Release.Namespace }}
     {{- end }}
-    {{- with .Values.loki.objectStorage }}
-    {{- if and (eq $.Values.loki.strategy "scalable") (not (and .endpoint .bucketNames)) }}
+    {{- if .Values.addons.minioOperator.enabled }}
     - name: minio-operator
       namespace: {{ $.Release.Namespace }}
     {{- end }}
-    {{- end }}
   {{- end }}
 {{- end }}

chart/templates/loki/values.yaml

@@ -165,14 +165,6 @@ gateway:
           fieldPath: status.podIP
 {{- end }}
 
-{{- with .Values.loki.objectStorage }}
-{{- if and (eq $.Values.loki.strategy "scalable") (not (and .endpoint .region)) }}
-minio:
-  enabled: true
-
-{{- end }}
-{{- end }}
-
 # Allows users to deploy distributed mode but calls out that we do not support it
 {{- if (eq .Values.loki.strategy "distributed") }}
 deploymentMode: Distributed