summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-03-02 16:15:38 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-02 16:15:38 +0000
commit08eb6b688159ad03c398d0235900318948ef7766 (patch)
tree5d1cfa3c9bdd72a383b23d26b87bd2d7110281ae
parentb1b0830acf662d9f2debacc416fbd5f11aa74d72 (diff)
parent88e44bf47f4c9f466f3171c2857029fae2e224f9 (diff)
Merge "[SDNC] Allow to use templates in external secret names"
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/values.yaml6
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/values.yaml4
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