From 31895e0d0a1f7313f2c844b264bc413c48b459c5 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 24 Jan 2024 11:09:33 +0000 Subject: [PATCH] [mimir-distributed-release-5.2] Revert "helm: omit `backend: s3` when minio is disabled" (#7201) (cherry picked from commit 7640ca1b5fa214f9b0d752d8879697f2dd2166a1) Co-authored-by: Dimitar Dimitrov --- operations/helm/charts/mimir-distributed/values.yaml | 2 +- .../mimir-distributed/templates/mimir-config.yaml | 1 + .../mimir-distributed/templates/mimir-config.yaml | 1 + .../mimir-distributed/templates/mimir-config.yaml | 1 + .../mimir-distributed/templates/mimir-config.yaml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index 81931cb8330..ae9a3fc8972 100644 --- 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 index e36befaba33..d2e5373be54 100644 --- 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/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml index 1f70784df2a..0843a9e034c 100644 --- a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/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/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml index fe377953499..538f2e96d33 100644 --- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/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 index 53fd922f081..1993a20ca68 100644 --- 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