From c75eacbe1c686e635673fc2280003518303e43ac Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Fri, 24 Apr 2020 14:29:17 +0100
Subject: [DMAAP] Moving DMaaP post-install jobs to 1 BC job

Change-Id: I11fe412600d1061e5667a5531d36cecbecdd34e3
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: OOM-2369
---
 .../dmaap/components/dmaap-bc/templates/deployment.yaml      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to '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 2cfa3738b2..3c6a23a470 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
@@ -41,11 +41,7 @@ spec:
         image: "{{ .Values.global.envsubstImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
-
-{{- if .Values.global.aafEnabled }}
-
 {{ include "common.certInitializer.initContainer" . | nindent 6 }}
-
       - name: {{ include "common.name" . }}-permission-fixer
         image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -61,15 +57,16 @@ 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 }}
-{{- if .Values.PG.enabled }}
       - name: {{ include "common.name" . }}-postgres-readiness
         command:
         - /root/ready.py
         args:
         - --container-name
         - {{ .Values.postgres.nameOverride }}
+        - --container-name
+        - message-router
+        - --container-name
+        - dmaap-dr-node
         env:
         - name: NAMESPACE
           valueFrom:
@@ -78,7 +75,6 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-{{- end }}
 {{- end }}
       containers:
         - name: {{ include "common.name" . }}
-- 
cgit 1.2.3-korg