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.

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

Fix/s3 #868

Merged
merged 3 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion platform-apps/charts/loki/templates/es-loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
SECRETACCESSKEY: "{{ `{{ .SECRETACCESSKEY }}` }}"
ACCESSKEYID: "{{ `{{ .ACCESSKEYID }}` }}"
ENDPOINT: "{{ `{{ .ENDPOINT }}` }}"
ACCESSKEYID: "{{ `{{ .ACCESSKEYID }}` }}"
BUCKETNAME: "{{ `{{ .BUCKETNAME }}` }}"
data:
- secretKey: ACCESSKEYID
remoteRef:
Expand Down
2 changes: 1 addition & 1 deletion platform-apps/charts/loki/values-uibklab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ loki:
type: s3
s3:
s3: null # instead of s3 url we use the attributes below
endpoint: https://"${ENDPOINT}" # IP / Hostname of s3 bucket
endpoint: https://${ENDPOINT} # IP / Hostname of s3 bucket
region: us-east-1 # doesn't matter
secretAccessKey: "${SECRETACCESSKEY}"
accessKeyId: "${ACCESSKEYID}"
Expand Down
4 changes: 2 additions & 2 deletions platform-apps/charts/mimir/templates/es-mimir.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
SECRETACCESSKEY: "{{ `{{ .SECRETACCESSKEY }}` }}"
ACCESSKEYID: "{{ `{{ .ACCESSKEYID }}` }}"
ENDPOINT: "{{ `{{ .ENDPOINT }}` }}"
ACCESSKEYID: "{{ `{{ .ACCESSKEYID }}` }}"
BUCKETNAME: "{{ `{{ .BUCKETNAME }}` }}"
data:
- secretKey: ACCESSKEYID
remoteRef:
Expand All @@ -36,4 +36,4 @@ spec:
remoteRef:
key: sx-cnp-oss-kv/data/observability/s3
property: BUCKETNAME
{{- end }}
{{- end }}