diff options
Diffstat (limited to 'kubernetes/so/components/soHelpers')
3 files changed, 10 insertions, 71 deletions
diff --git a/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl b/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl index d16b4f7cf8..7e04706d4a 100644 --- a/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl +++ b/kubernetes/so/components/soHelpers/templates/_cadiValues.tpl @@ -2,8 +2,8 @@ {{- $dot := default . .dot -}} {{- $initRoot := default $dot.Values.soHelpers .initRoot -}} cadiLoglevel: {{ $initRoot.cadi.logLevel }} -cadiKeyFile: {{ $initRoot.certInitializer.credsPath }}/{{ $initRoot.aaf.keyFile }} -cadiTrustStore: {{ $initRoot.certInitializer.credsPath }}/{{ $initRoot.aaf.trustore }} +cadiKeyFile: {{ $initRoot.certInitializer.credsPath }}/{{ $initRoot.certInitializer.fqi_namespace }}.keyfile +cadiTrustStore: {{ $initRoot.certInitializer.credsPath }}/truststoreONAPall.jks cadiTruststorePassword: ${TRUSTSTORE_PASSWORD} cadiLatitude: {{ $initRoot.cadi.latitude }} cadiLongitude: {{ $initRoot.cadi.longitude }} diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl index c5232e8f48..cda61b2cfa 100644 --- a/kubernetes/so/components/soHelpers/templates/_certificates.tpl +++ b/kubernetes/so/components/soHelpers/templates/_certificates.tpl @@ -3,40 +3,6 @@ {{- $initRoot := default $dot.Values.soHelpers .initRoot -}} {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} {{ include "common.certInitializer.initContainer" $subchartDot }} -{{- if $dot.Values.global.aafEnabled }} -- name: {{ include "common.name" $dot }}-msb-cert-importer - image: {{ include "repositoryGenerator.repository" $subchartDot }}/{{ $dot.Values.global.aafAgentImage }} - imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} - command: - - "/bin/sh" - args: - - "-c" - - | - export $(grep '^c' {{ $subchartDot.Values.certInitializer.credsPath }}/mycreds.prop | xargs -0) - keytool -import -trustcacerts -alias msb_root -file \ - /certificates/msb-ca.crt -keystore \ - "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \ - -storepass $cadi_truststore_password -noprompt - export EXIT_VALUE=$? - if [ "${EXIT_VALUE}" != "0" ] - then - echo "issue with password: $cadi_truststore_password" - ls -lh {{ $subchartDot.Values.certInitializer.credsPath }}/mycreds.prop - cat {{ $subchartDot.Values.certInitializer.credsPath }}/mycreds.prop - exit $EXIT_VALUE - else - keytool -importkeystore -srckeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/truststoreONAPall.jks" \ - -srcstorepass {{ $subchartDot.Values.certInitializer.trustStoreAllPass }} \ - -destkeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \ - -deststorepass $cadi_truststore_password -noprompt - export EXIT_VALUE=$? - fi - exit $EXIT_VALUE - volumeMounts: - {{ include "common.certInitializer.volumeMount" $subchartDot | indent 2 | trim }} - - name: {{ include "common.name" $dot }}-msb-certificate - mountPath: /certificates -{{- end }} {{- end -}} {{- define "so.certificate.volumes" -}} @@ -44,11 +10,6 @@ {{- $initRoot := default $dot.Values.soHelpers .initRoot -}} {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} {{ include "common.certInitializer.volumes" $subchartDot }} -{{- if $dot.Values.global.aafEnabled }} -- name: {{ include "common.name" $dot }}-msb-certificate - secret: - secretName: {{ include "common.secret.getSecretNameFast" (dict "global" $subchartDot "uid" "so-onap-certs") }} -{{- end }} {{- end -}} {{- define "so.certificate.volumeMount" -}} @@ -64,10 +25,10 @@ {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} {{- if $dot.Values.global.aafEnabled }} - name: TRUSTSTORE - value: {{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }} + value: {{ $subchartDot.Values.certInitializer.credsPath }}/truststoreONAPall.jks {{- if $dot.Values.global.security.aaf.enabled }} - name: KEYSTORE - value: {{ $subchartDot.Values.certInitializer.credsPath }}/org.onap.so.p12 + value: {{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.certInitializer.fqi_namespace }}.p12 {{- end }} {{- end }} {{- end -}} diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml index a367272d9a..938a6f9d00 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 @@ -22,26 +23,6 @@ global: enabled: false app: msoKey: 07a7159d3bf51a0e53be7a8f89699be7 - client: - certs: - truststore: /app/client/org.onap.so.trust.jks - keystore: /app/client/org.onap.so.jks - trustStorePassword: LHN4Iy5DKlcpXXdWZ0pDNmNjRkhJIzpI - keyStorePassword: c280b25hcA== - certificates: - 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 @@ -57,19 +38,16 @@ certInitializer: cadi_latitude: '0.0' 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 + qi_namespace: org.onap.so + 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 + echo "TRUSTSTORE_PASSWORD={{ .Values.truststorePassword }}" >> {{ .Values.credsPath }}/mycreds.prop aafConfig: permission_user: 1000 permission_group: 999 -aaf: - trustore: org.onap.so.trust.jks - keyFile: org.onap.so.keyfile - ################################################################# # Application configuration defaults. ################################################################# |