diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-05 15:56:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-05 15:56:23 +0000 |
| commit | a183088f2baaa5d794b8b5f67eceb5f65b7fc318 (patch) | |
| tree | 08b87fceec5627f9efb40e5d0271ea32a3fba275 /kubernetes/dcaegen2/components/dcae-dashboard/templates | |
| parent | ab855f16727d3d69c3b97066997283f47ef9ae1c (diff) | |
| parent | f2816a0fb6271197155bf7514ec16f39faaed0a2 (diff) | |
Merge "[DCAEGEN2][dashboard] Use common secret template for postgres credentials"
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-dashboard/templates')
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-dashboard/templates/secret.yaml | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml index a926fb396b..bab034469b 100644 --- a/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml @@ -126,11 +126,11 @@ spec: - name: consul_url value: http://consul-server-ui:8500 - name: postgres_user_dashboard - value: {{ .Values.postgres.config.pgUserName }} + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 14 }} + - name: postgres_password_dashboard + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 14 }} - name: postgres_db_name value: {{ .Values.postgres.config.pgDatabase }} - - name: postgres_password_dashboard - value: {{ .Values.postgres.config.pgUserPassword }} - name: postgres_ip value: {{ .Values.postgres.service.name2 }} - name: POD_IP @@ -169,4 +169,3 @@ spec: name: tls-info imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" - diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/templates/secret.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/templates/secret.yaml new file mode 100644 index 0000000000..b143034d8f --- /dev/null +++ b/kubernetes/dcaegen2/components/dcae-dashboard/templates/secret.yaml @@ -0,0 +1,16 @@ +{{/* +# 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. +# # You may obtain a copy of the License at +# # +# # http://www.apache.org/licenses/LICENSE-2.0 +# # +# # Unless required by applicable law or agreed to in writing, software +# # distributed under the License is distributed on an "AS IS" BASIS, +# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# # See the License for the specific language governing permissions and +# # limitations under the License. +*/}} +{{ include "common.secretFast" . }} |