diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-23 16:45:52 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-03-18 20:20:08 +0000 |
| commit | d311405bf25785e15b206f41eb98921713a990f3 (patch) | |
| tree | 1d607790342b53f563bc1ea87186f2ca926686f6 /kubernetes/so/components/soHelpers/values.yaml | |
| parent | 0c31367d791d773bda5687d5977497a1e8215e4f (diff) | |
[SO] Simplify cert retrieval script
As retrieving values is now done via a generic script, let's clean a
little bit cert retrieval in order to remove unneeded part.
Also, as MSB is now using certInitialize, we don't need to onboard it's
certificate.
Issue-ID: OOM-2688
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I5b8ed861ab94b97f2de0d52a4e4385b97a4f5afc
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 |