diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-07-17 13:54:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-17 13:54:33 +0000 |
| commit | d344d669fa3046808a63610e61ef3547cac629cc (patch) | |
| tree | e755e6eff832cbe489991cfc23005acd2b79bb6a /kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml | |
| parent | aaed64d155c5f1aaf22943eb1e7fb3e443f5168c (diff) | |
| parent | 8e9f8bda5bac4ea122f130de6a20fd3e179bb2b2 (diff) | |
Merge "[POLICY] tomcat security upgrade legacy components" into frankfurt
Diffstat (limited to 'kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml')
| -rw-r--r-- | kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml index 35f8aacb40..2e6a08c487 100644 --- a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml +++ b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2018 Ericsson. All rights reserved. +# Modifications Copyright (C) 2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -43,10 +44,8 @@ spec: - sh args: - -c - - "export TRUSTSTORE_PASSWORD_BASE64=`echo -n ${TRUSTSTORE_PASSWORD} | base64`; cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" + - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" env: - - name: TRUSTSTORE_PASSWORD - {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-pass" "key" "password") | indent 10 }} - name: RESTSERVER_USER {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-creds" "key" "login") | indent 10 }} - name: RESTSERVER_PASSWORD @@ -84,6 +83,10 @@ spec: env: - name: REPLICAS value: "{{ .Values.replicaCount }}" + - name: KEYSTORE_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "keystore-pass" "key" "password") | indent 12 }} + - name: TRUSTSTORE_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-pass" "key" "password") | indent 12 }} volumeMounts: - mountPath: /etc/localtime name: localtime |