From 88e44bf47f4c9f466f3171c2857029fae2e224f9 Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Wed, 26 Feb 2020 02:23:23 +0100 Subject: [PATCH] [SDNC] Allow to use templates in external secret names Issue-ID: OOM-2309 Signed-off-by: Krzysztof Opasiak Change-Id: I24fc7c69d6e7999c2ac8107c8d3ed3af22baae42 --- kubernetes/sdnc/charts/dmaap-listener/values.yaml | 2 +- kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml | 2 +- kubernetes/sdnc/charts/sdnc-portal/values.yaml | 6 +++--- kubernetes/sdnc/charts/ueb-listener/values.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml index d90da63e6d..bec4d1cac1 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml @@ -46,7 +46,7 @@ secrets: passwordPolicy: required - uid: odl-creds type: basicAuth - externalSecret: '{{ .Values.config.odlCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}' login: '{{ .Values.config.odlUser }}' password: '{{ .Values.config.odlPassword }}' passwordPolicy: required diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml index b0b3c81c8f..4ee7c6f25d 100644 --- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml @@ -46,7 +46,7 @@ secrets: passwordPolicy: required - uid: rest-creds type: basicAuth - externalSecret: '{{ .Values.config.restCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.restCredsExternalSecret) . }}' login: '{{ .Values.config.restUser }}' password: '{{ .Values.config.restPassword }}' passwordPolicy: required diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml index fa38cf756a..94ea5d75fc 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml @@ -52,19 +52,19 @@ secrets: passwordPolicy: required - uid: odl-creds type: basicAuth - externalSecret: '{{ .Values.config.odlCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}' login: '{{ .Values.config.odlUser }}' password: '{{ .Values.config.odlPassword }}' passwordPolicy: required - uid: fabric-db-creds type: basicAuth - externalSecret: '{{ .Values.config.odlCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}' login: '{{ .Values.config.dbFabricUser }}' password: '{{ .Values.config.dbFabricPassword }}' passwordPolicy: required - uid: keystore-password type: password - externalSecret: '{{ .Values.config.KeyStorePwdExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.KeyStorePwdExternalSecret) . }}' password: '{{ .Values.config.keystorePwd }}' passwordPolicy: required diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml index 03fbf52f9b..9b7dcb054b 100644 --- a/kubernetes/sdnc/charts/ueb-listener/values.yaml +++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml @@ -46,13 +46,13 @@ secrets: passwordPolicy: required - uid: odl-creds type: basicAuth - externalSecret: '{{ .Values.config.odlCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}' login: '{{ .Values.config.odlUser }}' password: '{{ .Values.config.odlPassword }}' passwordPolicy: required - uid: ueb-creds type: basicAuth - externalSecret: '{{ .Values.config.odlCredsExternalSecret }}' + externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}' login: '{{ .Values.config.uebUser }}' password: '{{ .Values.config.uebPassword }}' passwordPolicy: required -- 2.16.6