Merge "[SDC] Change default access mode for cert PVC"

[oom.git] / kubernetes / dmaap / components / dmaap-dr-node / templates / post-install-job.yaml

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index 79c47a1..e9ab9c9 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -4,13 +4,14 @@ metadata:
   name: {{ include "common.fullname" . }}-post-install
   labels:
     app.kubernetes.io/managed-by: {{.Release.Service | quote }}
-    app.kubernetes.io/instance: {{.Release.Name | quote }}
+    app.kubernetes.io/instance: {{include "common.release" . | quote }}
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+    release: {{ include "common.release" . }}
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
     "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-5"
+    "helm.sh/hook-weight": "-2"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:
   template:
@@ -18,16 +19,24 @@ spec:
       name: {{ include "common.fullname" . }}
       labels:
         app.kubernetes.io/managed-by: {{.Release.Service | quote }}
-        app.kubernetes.io/instance: {{.Release.Name | quote }}
+        app.kubernetes.io/instance: {{include "common.release" . | quote }}
         helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+        release: {{ include "common.release" . }}
     spec:
       restartPolicy: Never
       containers:
       - name: post-install-job
         image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DELAY
           value: "60"
+    {{- if .Values.global.allow_http }}
+        - name: PROTO
+          value: "http"
+        - name: PORT
+          value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"