Message-router parameterization

added configmap
added primer for zookeeper and kafka

Issue-ID: OOM-731

Change-Id: I423294a57faa28beb95578a117ee02accc67a4b3
Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>

4 files changed, 58 insertions, 6 deletions

diff --git a/kubernetes/message-router/templates/dmaap-configmap.yaml b/kubernetes/message-router/templates/dmaap-configmap.yaml
new file mode 100644
index 0000000000..bd1e629b21
--- /dev/null
+++ b/kubernetes/message-router/templates/dmaap-configmap.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mr-dmaap-cadi-prop-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/cadi.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mr-dmaap-msgrtrapi-prop-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/MsgRtrApi.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mr-dmaap-mykey-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/mykey").AsConfig . | indent 2 }}
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index f81da769fd..a0c13802bb 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -63,10 +63,13 @@ spec:
           name: localtime
           readOnly: true
         - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
+          subPath: MsgRtrApi.properties
           name: appprops
         - mountPath: /appl/dmaapMR1/etc/cadi.properties
+          subPath: cadi.properties
           name: cadi
         - mountPath: /appl/dmaapMR1/etc/keyfile
+          subPath: mykey
           name: mykey
       restartPolicy: Always
       volumes:
@@ -74,14 +77,15 @@ spec:
         hostPath:
           path: /etc/localtime
       - name: appprops
-        hostPath:
-          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
+        configMap:
+          name: mr-dmaap-msgrtrapi-prop-configmap
       - name: cadi
-        hostPath:
-          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
+        configMap:
+          name: mr-dmaap-cadi-prop-configmap
       - name: mykey
-        hostPath:
-          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
+        configMap:
+          name: mr-dmaap-mykey-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 {{ end }}
+
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 2607ce64b9..844de040d4 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -31,6 +31,17 @@ spec:
     spec:
       initContainers:
       - command:
+        - bash
+        args:
+        - -c
+        - "if [ -d /var/tmp/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0 ]; then echo nothing to do; else cp -a /opt/config/src/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/* /var/tmp/; fi"
+        image: {{ .Values.image.config }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /var/tmp
+          name: kafka-data
+        name: kafka-primer
+      - command:
         - /root/ready.py
         args:
         - --container-name
@@ -88,3 +99,4 @@ spec:
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}
+
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index d232c2eede..1b3e8f8ed9 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -29,6 +29,18 @@ spec:
         app: zookeeper
       name: message-router-zookeeper
     spec:
+      initContainers:
+      - command:
+        - bash
+        args:
+        - -c
+        - "if [ -d /var/tmp/version-2 ]; then echo nothing to do; else cp -a /opt/config/src/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/* /var/tmp/; fi"
+        image: {{ .Values.image.config }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /var/tmp
+          name: zookeeper-data
+        name: zookeeper-primer
       containers:
       - image: {{ .Values.image.zookeeper }}
         imagePullPolicy: {{ .Values.pullPolicy }}
@@ -57,3 +69,4 @@ spec:
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}
+