X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fmessage-router%2Ftemplates%2Fpost-install-job.yaml;h=26f38c9a4fb593bc876424dae2e59dad92c8b6b5;hb=c32ee22a8436a184d710db9d06da85c4ca385efc;hp=f428491127bcde43a05e863263cbf2b24ef6548f;hpb=21a2b5e67d78ad321e307aa39d5d55aaf37c8353;p=oom.git

diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index f428491127..26f38c9a4f 100644
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -1,12 +1,26 @@
+{{- if  .Values.global.aafEnabled }}
+# Copyright © 2020 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 apiVersion: batch/v1
 kind: Job
 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: {{ .Release.Name }}
+    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.
@@ -19,9 +33,9 @@ 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: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       restartPolicy: Never
       containers:
@@ -73,3 +87,4 @@ spec:
             name: {{ include "common.fullname" . }}-dbc-topics
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
+{{- end }}
\ No newline at end of file