[DMAAP] DMaaP ServiceMesh compatibility

[oom.git] / kubernetes / dmaap / components / dmaap-bc / templates / deployment.yaml

diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
index c9b6800..a0c3154 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       {{ include "common.podSecurityContext" . | indent 6 | trim}}
-{{- if or .Values.global.aafEnabled .Values.PG.enabled }}
+{{- if .Values.PG.enabled }}
       initContainers:
       - command:
         - sh
@@ -45,6 +45,7 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
 {{ include "common.certInitializer.initContainer" . | nindent 6 }}
+{{- if .Values.global.aafEnabled }}
       - name: {{ include "common.name" . }}-permission-fixer
         securityContext:
           runAsUser: 0
@@ -62,6 +63,7 @@ spec:
         volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
         command: ["/bin/sh"]
         args: [ "-c", "sed -i -e '/cadi_keystore_password=/d' -e '/cadi_keystore_password_jks/p' -e 's/cadi_keystore_password_jks/cadi_keystore_password/' -e 's/dmaap-bc.p12/dmaap-bc.jks/' /opt/app/osaaf/local/org.onap.dmaap-bc.cred.props" ]
+{{- end }}
       - name: {{ include "common.name" . }}-postgres-readiness
         securityContext:
           runAsUser: 100