From ed7b049fe6646b36a0af1047e6126618e93d10bb Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Tue, 1 Sep 2020 18:35:40 +0200 Subject: [COMMON] Use faster version of common secret template Replace all calls to common.secret in mariadb-init with the faster version common.secretFast to save some linting time. Issue-ID: OOM-2248 Change-Id: Id1658b46f3322ecc68155fafd72480e922978369 Signed-off-by: Krzysztof Opasiak --- .../common/mariadb-init/templates/secret.yaml | 25 +++------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'kubernetes/common/mariadb-init/templates/secret.yaml') diff --git a/kubernetes/common/mariadb-init/templates/secret.yaml b/kubernetes/common/mariadb-init/templates/secret.yaml index 71a89d019b..2db326f163 100644 --- a/kubernetes/common/mariadb-init/templates/secret.yaml +++ b/kubernetes/common/mariadb-init/templates/secret.yaml @@ -1,4 +1,5 @@ # Copyright © 2017 Amdocs, Bell Canada, Orange +# Copyright © 2020 Samsung Electronics # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,26 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- define "mariadb-init._update-secrets" -}} - {{ range $db, $dbInfos := .Values.config.mysqlAdditionalDatabases }} -{{ printf "- uid: %s" $db }} -{{ printf " type: basicAuth" }} - {{- if $dbInfos.externalSecret }} -{{ printf " externalSecret: %s" $dbInfos.externalSecret }} - {{- end }} -{{ printf " login: %s" $dbInfos.user }} -{{ printf " password: %s" $dbInfos.password }} -{{ printf " passwordPolicy: required" }} - {{- end -}} -{{- end -}} +{{ include "mariadbInit._updateSecrets" . -}} -{{ $global := . }} -{{ $secretsString := .Values.secrets | toYaml | indent 2 }} -{{ $additionalSecretsString := (include "mariadb-init._update-secrets" .) | indent 2 }} -{{ $finalSecretsString := (cat "\nsecrets:\n" $secretsString $additionalSecretsString) | replace " -" " -" }} -{{ $finalSecrets := ($finalSecretsString | fromYaml).secrets }} - -{{ $newValues := set $global.Values "secrets" $finalSecrets }} -{{ $tmpGlobal := set $global "Values" $newValues }} - -{{ include "common.secret" $tmpGlobal }} +{{ include "common.secretFast" . }} -- cgit 1.2.3-korg