Skip to content

Commit d6c2a8e

Browse files
okhowangjkroepkeJStickler
authored
feat(helm): Support bypass all s3/gcs/azure config in object_store (#17597)
Signed-off-by: okhowang <[email protected]> Co-authored-by: Jan-Otto Kröpke <[email protected]> Co-authored-by: J Stickler <[email protected]>
1 parent 3a9b8e8 commit d6c2a8e

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

production/helm/loki/templates/_helpers.tpl

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,31 +1175,13 @@ the thanos_storage_config model*/}}
11751175
{{- with .ctx.Values.loki.storage.object_store }}
11761176
{{- if eq .type "s3" }}
11771177
s3:
1178-
{{- with .s3 }}
1179-
bucket_name: {{ $bucketName }}
1180-
endpoint: {{ .endpoint }}
1181-
access_key_id: {{ .access_key_id }}
1182-
secret_access_key: {{ .secret_access_key }}
1183-
region: {{ .region }}
1184-
insecure: {{ .insecure }}
1185-
http:
1186-
{{ toYaml .http | nindent 4 }}
1187-
sse:
1188-
{{ toYaml .sse | nindent 4 }}
1189-
{{- end }}
1178+
{{- toYaml ( mergeOverwrite .s3 (dict "bucket_name" $bucketName) ) | nindent 2 }}
11901179
{{- else if eq .type "gcs" }}
11911180
gcs:
1192-
{{- with .gcs }}
1193-
bucket_name: {{ $bucketName }}
1194-
service_account: {{ .service_account }}
1195-
{{- end }}
1181+
{{- toYaml ( mergeOverwrite .gcs (dict "bucket_name" $bucketName ) ) | nindent 2 }}
11961182
{{- else if eq .type "azure" }}
11971183
azure:
1198-
{{- with .azure }}
1199-
container_name: {{ $bucketName }}
1200-
account_name: {{ .account_name }}
1201-
account_key: {{ .account_key }}
1202-
{{- end }}
1184+
{{- toYaml ( mergeOverwrite .azure (dict "container_name" $bucketName ) ) | nindent 2 }}
12031185
{{- end }}
12041186
storage_prefix: {{ .storage_prefix }}
12051187
{{- end }}

0 commit comments

Comments
 (0)