Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[oom.git] / kubernetes / so / components / soHelpers / templates / _certificates.tpl

diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
index fa25ba5..cda61b2 100644 (file)
--- a/kubernetes/so/components/soHelpers/templates/_certificates.tpl
+++ b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
@@ -3,25 +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 "common.repository" $dot }}/{{ $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 }}" \
-      -keypass $cadi_truststore_password -noprompt
-  volumeMounts:
-  {{ include "common.certInitializer.volumeMount" $subchartDot | indent 2 | trim }}
-  - name: {{ include "common.name" $dot }}-msb-certificate
-    mountPath: /certificates
-{{- end }}
 {{- end -}}
 
 {{- define "so.certificate.volumes" -}}
@@ -29,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" -}}
@@ -49,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.jks
+  value: {{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.certInitializer.fqi_namespace }}.p12
 {{-     end }}
 {{-   end }}
 {{- end -}}