|
|
@ -10,21 +10,18 @@ |
|
|
{{- if and .Values.s3.reuseLegacySecret $existingSecret }} |
|
|
{{- if and .Values.s3.reuseLegacySecret $existingSecret }} |
|
|
{{- $reuse = true }} |
|
|
{{- $reuse = true }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- $access_key_admin := "" -}} |
|
|
|
|
|
{{- $secret_key_admin := "" -}} |
|
|
|
|
|
{{- if and (dig "credentials" "admin" "accessKey" "" .Values.s3) (dig "credentials" "admin" "secretKey" "" .Values.s3) -}} |
|
|
|
|
|
{{- $access_key_admin = .Values.s3.credentials.admin.accessKey -}} |
|
|
|
|
|
{{- $secret_key_admin = .Values.s3.credentials.admin.secretKey -}} |
|
|
|
|
|
{{- else -}} |
|
|
|
|
|
|
|
|
{{- $creds := .Values.s3.credentials | default dict -}} |
|
|
|
|
|
{{- $adminCreds := $creds.admin | default dict -}} |
|
|
|
|
|
{{- $access_key_admin := $adminCreds.accessKey -}} |
|
|
|
|
|
{{- $secret_key_admin := $adminCreds.secretKey -}} |
|
|
|
|
|
{{- if not (and $access_key_admin $secret_key_admin) -}} |
|
|
{{- $access_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $access_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $secret_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $secret_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- end -}} |
|
|
{{- end -}} |
|
|
{{- $access_key_read := "" -}} |
|
|
|
|
|
{{- $secret_key_read := "" -}} |
|
|
|
|
|
{{- if and (dig "credentials" "read" "accessKey" "" .Values.s3) (dig "credentials" "read" "secretKey" "" .Values.s3) -}} |
|
|
|
|
|
{{- $access_key_read = .Values.s3.credentials.read.accessKey -}} |
|
|
|
|
|
{{- $secret_key_read = .Values.s3.credentials.read.secretKey -}} |
|
|
|
|
|
{{- else -}} |
|
|
|
|
|
|
|
|
{{- $readCreds := $creds.read | default dict -}} |
|
|
|
|
|
{{- $access_key_read := $readCreds.accessKey -}} |
|
|
|
|
|
{{- $secret_key_read := $readCreds.secretKey -}} |
|
|
|
|
|
{{- if not (and $access_key_read $secret_key_read) -}} |
|
|
{{- $access_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $access_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $secret_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- $secret_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}} |
|
|
{{- end -}} |
|
|
{{- end -}} |
|
|
|