diff options
author | 2021-03-18 23:01:04 +0000 | |
---|---|---|
committer | 2021-03-18 23:01:04 +0000 | |
commit | de5edf772c56647eee03c60d24e3cf1d41c56c21 (patch) | |
tree | a8a3e868d227a03cf0ac47e6288f469f752d1f84 /kubernetes/so/components/soHelpers/values.yaml | |
parent | 3b3b7fd2bc57427f79c98ae4ea82c28140ae6fcd (diff) | |
parent | d311405bf25785e15b206f41eb98921713a990f3 (diff) |
Merge "[SO] Simplify cert retrieval script"
Diffstat (limited to 'kubernetes/so/components/soHelpers/values.yaml')
-rwxr-xr-x | kubernetes/so/components/soHelpers/values.yaml | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml index a367272d9a..612f7c1dee 100755 --- a/kubernetes/so/components/soHelpers/values.yaml +++ b/kubernetes/so/components/soHelpers/values.yaml @@ -1,5 +1,6 @@ # Copyright © 2018 AT&T USA # Copyright © 2020 Huawei +# Copyright © 2021 Orange # 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 @@ -32,16 +33,6 @@ global: path: /etc/ssl/certs share_path: /usr/local/share/ca-certificates/ -################################################################# -# Secrets metaconfig -################################################################# -secrets: - - uid: 'so-onap-certs' - name: '{{ include "common.release" . }}-so-certs' - externalSecret: '{{ tpl (default "" .Values.certSecret) . }}' - type: generic - filePaths: - - resources/config/certificates/msb-ca.crt ################################################################# # AAF part @@ -58,9 +49,9 @@ certInitializer: app_ns: org.osaaf.aaf credsPath: /opt/app/osaaf/local trustStoreAllPass: changeit - aaf_add_config: > - /opt/app/aaf_config/bin/agent.sh local showpass - {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop + aaf_add_config: | + echo "cadi_truststore_password=$cadi_truststore_password" > {{ .Values.credsPath }}/mycreds.prop + echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop aafConfig: permission_user: 1000 |