Browse Source

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

pull/5049/head
Max Roby 1 year ago
committed by Chris Lu
parent
commit
ac6158818b
  1. 8
      k8s/charts/seaweedfs/templates/post-install-user-hook.yaml
  2. 2
      k8s/charts/seaweedfs/values.yaml

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

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

2
k8s/charts/seaweedfs/values.yaml

@ -579,8 +579,6 @@ filer:
# 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:
# '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:
# - bucket-a
# - bucket-b

Loading…
Cancel
Save