reuse storage config block

production/helm/loki/templates/_helpers.tpl

@@ -1150,9 +1150,10 @@ This function needs to be called with a context object containing the following
 the thanos_storage_config model*/}}
 {{- define "loki.thanosStorageConfig" -}}
 {{- $bucketName := .bucketName }}
-{{- with .ctx.Values.loki.storage.object_store }}
+{{- with .ctx.Values.loki.storage }}
 {{- if eq .type "s3" }}
 s3:
+  {{- with .s3 }}
   bucket_name: {{ $bucketName }}
   {{- with .endpoint }}
   endpoint: {{ . }}
@@ -1171,26 +1172,32 @@ s3:
   {{- end }}
   {{- with .http }}
   http:
-{{ toYaml . | indent 4 }}
+  {{ toYaml . | nindent 4 }}
   {{- end }}
   {{- with .sse }}
   sse:
-{{ toYaml . | indent 4 }}
+  {{ toYaml . | nindent 4 }}
+  {{- end }}
   {{- end }}
 {{- else if eq .type "gcs" }}
 gcs:
   bucket_name: {{ $bucketName }}
+  {{- with .gcs }}
   {{- with .service_account }}
   service_account: {{ . }}
   {{- end }}
+  {{- end }}
 {{- else if eq .type "azure" }}
+azure:
+  {{- with .azure }}
   container_name: {{ $bucketName }}
   {{- with .account_name }}
   account_name: {{ . }}
   {{- end }}
   {{- with .account_key }}
   account_key: {{ . }}
   {{- end }}
+  {{- end }}
 {{- end }}
 {{- with .prefix }}
 prefix: {{ . }}

production/helm/loki/values.yaml

@@ -393,30 +393,6 @@ loki:
     # Loki now supports using thanos storage clients for connecting to object storage backend.
     # This will become the default way to configure storage in a future releases.
     use_thanos_objstore: false
-    object_store:
-      # Type of object store. Valid options are: S3, GCS, AZURE
-      type: s3
-      prefix: null  # Optional prefix for storage keys
-
-      # S3 configuration (when type is "S3")
-      s3:
-        endpoint: null     # S3 endpoint URL
-        region: null       # Optional region
-        access_key_id: null      # Optional access key
-        secret_access_key: null  # Optional secret key
-        insecure: false       # Optional. Enable if using self-signed TLS
-        sse: {}         # Optional server-side encryption configuration
-        http: {}       # Optional HTTP client configuration
-
-      # GCS configuration (when type is "GCS")
-      gcs:
-        bucket_name: null  # Name of the bucket
-        service_account: null  # Optional service account JSON
-
-      # Azure configuration (when type is "AZURE")
-      azure:
-        account_name: null  # Storage account name
-        account_key: null  # Optional storage account key
 
   # -- Configure memcached as an external cache for chunk and results cache. Disabled by default
   # must enable and specify a host for each cache you would like to use.