gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

fix issue with underscores versus dashes in secret name causing variable expansion failure

Browse source
This commit is contained in:
Max Roby 2023-11-23 12:08:27 +01:00 committed by Chris Lu
parent f7b98ea1fb
commit ac6158818b
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
k8s/charts/seaweedfs/templates/post-install-user-hook.yaml
View file

@ -47,12 +47,12 @@ spec:
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ template "seaweedfs.name" . }}" value: "{{ template "seaweedfs.name" . }}"
{{- range $reg, $props := $.Values.filer.s3.createUsers }} {{- range $reg, $props := $.Values.filer.s3.createUsers }}
- name: {{ $props.secretName | upper }}_ID - name: {{ $props.name | upper }}_ACCESS_KEY_ID
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ $props.secretName }} name: {{ $props.secretName }}
key: ACCESS_KEY_ID key: ACCESS_KEY_ID
- name: {{ $props.secretName | upper }}_KEY - name: {{ $props.name | upper }}_SECRET_ACCESS_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ $props.secretName }} name: {{ $props.secretName }}
@ -67,8 +67,8 @@ spec:
"s3.configure --user {{ $props.name }} \ "s3.configure --user {{ $props.name }} \
--buckets {{ $props.buckets }} \ --buckets {{ $props.buckets }} \
--actions {{ $props.actions }} \ --actions {{ $props.actions }} \
--access_key ${{ $props.secretName | upper }}_ID \ --access_key ${{ $props.name | upper }}_ACCESS_KEY_ID \
--secret_key ${{ $props.secretName | upper }}_KEY \ --secret_key ${{ $props.name | upper }}_SECRET_ACCESS_KEY \
--apply true" |\ --apply true" |\
/usr/bin/weed shell /usr/bin/weed shell
{{- end }} {{- end }}

2
k8s/charts/seaweedfs/values.yaml
View file

@ -579,8 +579,6 @@ filer:
# You may specify buckets and users to be created during the install process # You may specify buckets and users to be created during the install process
# The user's credentials must be in an existing secret using the key names: # The user's credentials must be in an existing secret using the key names:
# 'ACCESS_KEY_ID' and 'ACCESS_SECRET_KEY' # 'ACCESS_KEY_ID' and 'ACCESS_SECRET_KEY'
# The secret name should use underscore '_' separators,
# using a dash '-' will case variable expansion to fail inside the job.
#createBuckets: #createBuckets:
# - bucket-a # - bucket-a
# - bucket-b # - bucket-b