Remove env variable from s3 bucket job

Remove the TLS_OPTION env from helm-toolkit s3-bucket job. There
can be different option for tls connection, depending on whether
the rgw server is local or remote. This change allows the
create-s3-bucket script to customize its connection argument
which can be pulled from values.yaml.

Change-Id: I2a34c1698e02cd71905bc6ef66f4aefcd5e25e44
This commit is contained in:
Lo, Chi (cl566n)
2021-05-07 10:06:33 -07:00
parent 4eee89ccba
commit f7fde88b6e
7 changed files with 10 additions and 7 deletions

View File

@@ -75,10 +75,6 @@ spec:
- -c
- /tmp/create-s3-bucket.sh
env:
{{- if and ($tlsCertificatePath) ($tlsCertificateSecret) }}
- name: TLS_OPTION
value: {{ printf "--ca-certs=%s" $tlsCertificatePath | quote }}
{{- end }}
{{- with $env := dict "s3AdminSecret" $envAll.Values.secrets.rgw.admin }}
{{- include "helm-toolkit.snippets.rgw_s3_admin_env_vars" $env | indent 12 }}
{{- end }}