[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

17 files changed, 97 insertions, 258 deletions

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/dr_nodes/central.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
index 7ef2dcdb8f..7ef2dcdb8f 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/dr_nodes/central.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/dr_nodes/edge.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
index 272cd75e52..272cd75e52 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/dr_nodes/edge.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README b/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README
index 4f5eac5ba1..4f5eac5ba1 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/README
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README
diff --git a/kubernetes/dmaap/components/message-router/resources/topics/PNF_READY.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_READY.json
index 8f4cf8bd64..8f4cf8bd64 100644
--- a/kubernetes/dmaap/components/message-router/resources/topics/PNF_READY.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_READY.json
diff --git a/kubernetes/dmaap/components/message-router/resources/topics/PNF_REGISTRATION.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json
index f0dd2c7829..f0dd2c7829 100644
--- a/kubernetes/dmaap/components/message-router/resources/topics/PNF_REGISTRATION.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json
diff --git a/kubernetes/dmaap/components/message-router/resources/topics/README b/kubernetes/dmaap/components/dmaap-bc/resources/topics/README
index fbb88b97e6..fbb88b97e6 100644
--- a/kubernetes/dmaap/components/message-router/resources/topics/README
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/README
diff --git a/kubernetes/dmaap/components/message-router/resources/topics/mirrormakeragent.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/mirrormakeragent.json
index ff1a5732e2..ff1a5732e2 100644
--- a/kubernetes/dmaap/components/message-router/resources/topics/mirrormakeragent.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/mirrormakeragent.json
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
index 37d39effd6..bb68eb783e 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
@@ -51,3 +51,55 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "common.fullname" . }}-dr-nodes
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/dr_nodes/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "common.fullname" . }}-feeds
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/feeds/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "common.fullname" . }}-mr-clusters
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/mr_clusters/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "common.fullname" . }}-topics
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/topics/*.json").AsConfig . | indent 2 }}
\ No newline at end of file
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:
@@ -79,7 +76,6 @@ spec:
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 {{- end }}
-{{- end }}
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ .Values.repository }}/{{ .Values.image }}"
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
index c06d4e1130..5b22f06aa8 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
@@ -1,44 +1,49 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "common.fullname" . }}-post-install
+  name: {{ include "common.fullname" . }}-dmaap-provisioning
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" . | nindent 4 }}
-  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-delete-policy": hook-succeeded
 spec:
+  backoffLimit: 5
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       restartPolicy: Never
+      initContainers:
+      - name: {{ include "common.name" . }}-init-readiness
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - dmaap-bc
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
       containers:
-      - name: post-install-job
+      - name: dmaap-provisioning-job
         image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DELAY
           value: "0"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
-{{- if (include "common.needTLS" .) }}
-          value: "https"
-        - name: PORT
-          value: "8443"
-{{- else }}
           value: "http"
         - name: PORT
           value: "8080"
-{{- end }}
+    {{ end }}
         - name: REQUESTID
-          value: "{{.Chart.Name}}-post-install"
+          value: "{{.Chart.Name}}-dmaap-provisioning"
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-
 # NOTE: on the following several configMaps, careful to include / at end
 #       since there may be more than one file in each mountPath
 # NOTE: the basename of the subdirectory of mountPath is important - it matches the DBCL API URI
@@ -46,6 +51,14 @@ spec:
           mountPath: /opt/app/config/dmaap/
         - name:  {{ include "common.fullname" . }}-dbc-dcaelocations
           mountPath: /opt/app/config/dcaeLocations/
+        - name:  {{ include "common.fullname" . }}-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/
+        - name:  {{ include "common.fullname" . }}-topics
+          mountPath: /opt/app/config/topics/
         resources: {{ include "common.resources" . | nindent 10 }}
         {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
@@ -63,5 +76,17 @@ spec:
         - name: {{ include "common.fullname" . }}-dbc-dcaelocations
           configMap:
             name: {{ include "common.fullname" . }}-dbc-dcaelocations
+        - name: {{ include "common.fullname" . }}-dr-nodes
+          configMap:
+            name: {{ include "common.fullname" . }}-dr-nodes
+        - name: {{ include "common.fullname" . }}-feeds
+          configMap:
+            name: {{ include "common.fullname" . }}-feeds
+        - name: {{ include "common.fullname" . }}-mr-clusters
+          configMap:
+            name: {{ include "common.fullname" . }}-mr-clusters
+        - name: {{ include "common.fullname" . }}-topics
+          configMap:
+            name: {{ include "common.fullname" . }}-topics
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
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
deleted file mode 100644
index d03d61690c..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata: {{ include "common.resourceMetadata" (dict "dot" . "suffix" "post-install" "annotations" .Values.job.annotations) | nindent 2 }}
-spec:
-  template:
-    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-    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"
-
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-
-# NOTE: on the following several configMaps, careful to include / at end
-#       since there may be more than one file in each mountPath
-# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
-        - name: {{ include "common.fullname" . }}-dbc-drnodes
-          mountPath: /opt/app/config/dr_nodes/
-        resources: {{ include "common.resources" . | nindent 10 }}
-        {{- if .Values.nodeSelector }}
-      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-      affinity: {{ toYaml .Values.affinity | nindent 8 }}
-        {{- end }}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-dbc-drnodes
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-drnodes
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 8b44e160ba..2b4b722bfb 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -77,12 +77,6 @@ persistence:
     labels:
       app.kubernetes.io/component: event-logs
 
-job:
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-2"
-    "helm.sh/hook-delete-policy": hook-succeeded
-
 #################################################################
 # AAF part
 #################################################################
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
deleted file mode 100644
index f8ce02835a..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-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: {{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": "-3"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    metadata:
-      name: {{ include "common.fullname" . }}
-      labels:
-        app.kubernetes.io/managed-by: {{.Release.Service | 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: "30"
-    {{- if .Values.global.allow_http }}
-        - name: PROTO
-          value: "http"
-        - name: PORT
-          value: "8080"
-    {{ end }}
-        - name: REQUESTID
-          value: "{{.Chart.Name}}-post-install"
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-# NOTE: on the following several configMaps, careful to include / at end
-#       since there may be more than one file in each mountPath
-# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
-        - name: {{ include "common.fullname" . }}-dbc-feeds
-          mountPath: /opt/app/config/feeds/
-        - name: {{ include "common.fullname" . }}-dbc-drpubs
-          mountPath: /opt/app/config/dr_pubs/
-        - name: {{ include "common.fullname" . }}-dbc-drsubs
-          mountPath: /opt/app/config/dr_subs/
-        resources:
-{{ include "common.resources" . | indent 10 }}
-        {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-        {{- end }}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-dbc-feeds
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-feeds
-        - name: {{ include "common.fullname" . }}-dbc-drpubs
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-drpubs
-        - name: {{ include "common.fullname" . }}-dbc-drsubs
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-drsubs
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 196be0dabe..3fb90f0533 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -120,7 +120,6 @@ mariadb:
   persistence:
     size: 1Gi
     mountSubPath: data-router/dr-db-data
-  disableNfsProvisioner: true
 
 #AAF local config
 aafConfig:
diff --git a/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json
deleted file mode 100644
index 6c201f6b30..0000000000
--- a/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dcaeLocationName": "san-francisco",
-  "fqdn": "message-router",
-  "topicProtocol": "https",
-  "topicPort": "3905"
-}
diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
deleted file mode 100644
index 26f38c9a4f..0000000000
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-{{- 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: {{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": "-4"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    metadata:
-      name: {{ include "common.fullname" . }}
-      labels:
-        app.kubernetes.io/managed-by: {{.Release.Service | 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: "Always"
-        env:
-        - name: DELAY
-          value: "30"
-    {{- if .Values.global.allow_http }}
-        - name: PROTO
-          value: "http"
-        - name: PORT
-          value: "8080"
-    {{ end }}
-        - name: REQUESTID
-          value: "{{.Chart.Name}}-post-install"
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-
-# NOTE: on the following several configMaps, careful to include / at end
-#       since there may be more than one file in each mountPath
-# NOTE: the basename of the subdirectory of mountPath is important - it matches the DBCL API URI
-        - name: {{ include "common.fullname" . }}-dbc-mrclusters
-          mountPath: /opt/app/config/mr_clusters/
-        - name: {{ include "common.fullname" . }}-dbc-topics
-          mountPath: /opt/app/config/topics/
-        resources:
-{{ include "common.resources" . | indent 10 }}
-        {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-        {{- end }}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-dbc-mrclusters
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-mrclusters
-        - name: {{ include "common.fullname" . }}-dbc-topics
-          configMap:
-            name: {{ include "common.fullname" . }}-dbc-topics
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
-{{- end }}
\ No newline at end of file
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index f9f20a3665..c6b4566e64 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -46,8 +46,6 @@ global:
   aafAppNs: org.osaaf.aaf
   aafLocatorContainer: oom
 
-
-
 #Component overrides
 message-router:
   enabled: true