Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(helm-chart): added SSE config into AWS storage config #13746

Merged
merged 3 commits into from
Aug 5, 2024
Merged

chore(helm-chart): added SSE config into AWS storage config #13746

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab9a5d8
made the template flexible to avoid copying each field separately.
vlad-diachenko Aug 2, 2024
8554ab6
Merge branch 'refs/heads/main' into vlad.diachenko/helm-chart-aws-cre…
vlad-diachenko Aug 5, 2024
ec9d074
version bump
vlad-diachenko Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 7 additions & 50 deletions production/helm/loki/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,30 +239,15 @@ s3:
insecure: {{ .insecure }}
{{- with .http_config}}
http_config:
{{- with .idle_conn_timeout }}
idle_conn_timeout: {{ . }}
{{- end}}
{{- with .response_header_timeout }}
response_header_timeout: {{ . }}
{{- end}}
{{- with .insecure_skip_verify }}
insecure_skip_verify: {{ . }}
{{- end}}
{{- with .ca_file}}
ca_file: {{ . }}
{{- end}}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .backoff_config}}
backoff_config:
{{- with .min_period }}
min_period: {{ . }}
{{- end}}
{{- with .max_period }}
max_period: {{ . }}
{{- end}}
{{- with .max_retries }}
max_retries: {{ . }}
{{- end}}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .sse }}
sse:
{{ toYaml . | indent 4 }}
{{- end }}
{{- end -}}

Expand Down Expand Up @@ -308,35 +293,7 @@ alibabacloud:
{{- else if eq .Values.loki.storage.type "swift" -}}
{{- with .Values.loki.storage.swift }}
swift:
{{- with .auth_version }}
auth_version: {{ . }}
{{- end }}
auth_url: {{ .auth_url }}
{{- with .internal }}
internal: {{ . }}
{{- end }}
username: {{ .username }}
user_domain_name: {{ .user_domain_name }}
{{- with .user_domain_id }}
user_domain_id: {{ . }}
{{- end }}
{{- with .user_id }}
user_id: {{ . }}
{{- end }}
password: {{ .password }}
{{- with .domain_id }}
domain_id: {{ . }}
{{- end }}
domain_name: {{ .domain_name }}
project_id: {{ .project_id }}
project_name: {{ .project_name }}
project_domain_id: {{ .project_domain_id }}
project_domain_name: {{ .project_domain_name }}
region_name: {{ .region_name }}
container_name: {{ .container_name }}
max_retries: {{ .max_retries | default 3 }}
connect_timeout: {{ .connect_timeout | default "10s" }}
request_timeout: {{ .request_timeout | default "5s" }}
{{ toYaml . | indent 2 }}
{{- end -}}
{{- else -}}
{{- with .Values.loki.storage.filesystem }}
Expand Down
Loading