[mimir-distributed-release-5.2] Revert "helm: omit backend: s3 when…

… minio is disabled" (#7201) (cherry picked from commit 7640ca1) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
grafana · Jan 24, 2024 · 31895e0 · 31895e0
1 parent 98a8380
commit 31895e0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -175,6 +175,7 @@ mimir:
 
     # This configures how the store-gateway synchronizes blocks stored in the bucket. It uses Minio by default for getting started (configured via flags) but this should be changed for production deployments.
     blocks_storage:
+      backend: s3
       bucket_store:
         {{- if index .Values "chunks-cache" "enabled" }}
         chunks_cache:
@@ -204,7 +205,6 @@ mimir:
         {{- end }}
         sync_dir: /data/tsdb-sync
       {{- if .Values.minio.enabled }}
-      backend: s3
       s3:
         access_key_id: {{ .Values.minio.rootUser }}
         bucket_name: {{ include "mimir.minioBucketPrefix" . }}-tsdb

diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -20,6 +20,7 @@ data:
       external_url: /alertmanager
       fallback_config_file: /configs/alertmanager_fallback_config.yaml
     blocks_storage:
+      backend: s3
       bucket_store:
         chunks_cache:
           backend: memcached

diff --git a/...tions/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml b/...tions/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -30,6 +30,7 @@ data:
     auth:
       type: enterprise
     blocks_storage:
+      backend: s3
       bucket_store:
         sync_dir: /data/tsdb-sync
       tsdb:

diff --git a/.../helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -20,6 +20,7 @@ data:
       external_url: /alertmanager
       fallback_config_file: /configs/alertmanager_fallback_config.yaml
     blocks_storage:
+      backend: s3
       bucket_store:
         sync_dir: /data/tsdb-sync
       tsdb:

diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -20,6 +20,7 @@ data:
       external_url: /alertmanager
       fallback_config_file: /configs/alertmanager_fallback_config.yaml
     blocks_storage:
+      backend: s3
       bucket_store:
         chunks_cache:
           backend: memcached