Skip to content
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 charts/s3proxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.0
version: 0.4.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
10 changes: 8 additions & 2 deletions charts/s3proxy/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,14 @@ data:
{{- if .Values.config.backends.azureblob.account }}
jclouds.identity={{ .Values.config.backends.azureblob.account }}
{{- end }}
{{- if or .Values.config.backends.azureblob.key.value .Values.config.backends.azureblob.sasToken.value }}
# Credentials will be merged from the secret properties file
{{- /* When a storage account key is set, jclouds.credential is merged in from the
Secret. Otherwise the azureblob-sdk provider authenticates with the SAS token
(jclouds.azureblob.sas, merged from the Secret) or the ambient Azure Workload
Identity credentials injected into the pod. S3Proxy still requires
jclouds.credential in every backend properties file (only filesystem-nio2,
transient-nio2 and google-cloud-storage-sdk are exempt), so emit it empty. */}}
{{- if not .Values.config.backends.azureblob.key.value }}
jclouds.credential=
{{- end }}
{{- range $index, $bucket := .Values.config.backends.azureblob.bucketLocators }}
s3proxy.bucket-locator.{{ add $index 1 }}={{ $bucket }}
Expand Down
Loading