[DMAAP] DMaaP ServiceMesh compatibility

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

diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
index 5b22f06..ab6f573 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
@@ -5,17 +5,17 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" . | nindent 4 }}
 spec:
-  backoffLimit: 5
+  backoffLimit: 20
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       restartPolicy: Never
       initContainers:
       - name: {{ include "common.name" . }}-init-readiness
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command:
-        - /root/ready.py
+        - /app/ready.py
         args:
         - --container-name
         - dmaap-bc
@@ -27,12 +27,12 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: dmaap-provisioning-job
-        image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.clientImage }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DELAY
           value: "0"
-    {{- if .Values.global.allow_http }}
+    {{- if or (include "common.onServiceMesh" .) .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
@@ -52,14 +52,15 @@ spec:
         - name:  {{ include "common.fullname" . }}-dbc-dcaelocations
           mountPath: /opt/app/config/dcaeLocations/
         - name:  {{ include "common.fullname" . }}-dr-nodes
-          mountPath: /opt/app/config/dr-nodes/
+          mountPath: /opt/app/config/dr_nodes/
         - name:  {{ include "common.fullname" . }}-feeds
           mountPath: /opt/app/config/feeds/
         - name:  {{ include "common.fullname" . }}-mr-clusters
-          mountPath: /opt/app/config/mr-clusters/
+          mountPath: /opt/app/config/mr_clusters/
         - name:  {{ include "common.fullname" . }}-topics
           mountPath: /opt/app/config/topics/
         resources: {{ include "common.resources" . | nindent 10 }}
+      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
         {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
         {{- end -}}