diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-09-29 07:39:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-09-29 07:39:41 +0000 |
commit | c95a5a8cd9fdd94bf2cd08a23016428f9472d50a (patch) | |
tree | 12999e3378e99d65764c76dc2cb97c86ae9505bb /kubernetes/dcaegen2/components/dcae-policy-handler/templates | |
parent | deaa8416bf1f42a5ed160fb47ad25ec3a79b512b (diff) | |
parent | 12db78947bd0a76ebfad5cd8e46d5174469207e7 (diff) |
Merge "[DCAEGEN2] Use common secret template for cloudify password"
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-policy-handler/templates')
-rw-r--r-- | kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml | 4 | ||||
-rw-r--r-- | kubernetes/dcaegen2/components/dcae-policy-handler/templates/secrets.yaml | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml index a29e334a25..61084fa26c 100644 --- a/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml @@ -1,6 +1,6 @@ #============LICENSE_START======================================================== # ================================================================================ -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -117,7 +117,7 @@ spec: - name: CLOUDIFY_USER value: admin - name: CLOUDIFY_PASSWORD - value: admin + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cm-pass" "key" "password") | indent 14 }} - name: CONFIG_BINDING_SERVICE value: config-binding-service - name: POD_IP diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/templates/secrets.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/secrets.yaml new file mode 100644 index 0000000000..34932b713d --- /dev/null +++ b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/secrets.yaml @@ -0,0 +1,17 @@ +{{/* +# 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" . }} |