Merge "Initial calls to dmaaa-bc API"

2 files changed, 67 insertions, 0 deletions

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
index ef50157a00..8f23423dcf 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
@@ -20,3 +20,43 @@ metadata:
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dmaap
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/dmaap/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dcaelocations
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-mrclusters
+  namespace: {{ include "common.namespace" . }}
+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" . }}
+data:
+{{ tpl (.Files.Glob "resources/topics/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-feeds
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/feeds/*.json").AsConfig . | indent 2 }}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index c1935b2e3e..ae90a9f2eb 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -74,6 +74,18 @@ spec:
           - name: {{ include "common.name" . }}-config
             mountPath: /opt/app/config/conf
             subPath: buscontroller.env
+
+# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
+          - name: {{ include "common.name" . }}-dmaap
+            mountPath: /opt/app/config/dmaap/
+          - name: {{ include "common.name" . }}-dcaelocations
+            mountPath: /opt/app/config/dcaeLocations/
+          - name: {{ include "common.name" . }}-mrclusters
+            mountPath: /opt/app/config/mr_clusters/
+          - name: {{ include "common.name" . }}-topics
+            mountPath: /opt/app/config/topics/
+          - name: {{ include "common.name" . }}-feeds
+            mountPath: /opt/app/config/feeds/
           resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -91,5 +103,20 @@ spec:
         - name: {{ include "common.name" . }}-config
           configMap:
             name: {{ include "common.fullname" . }}-config
+        - name: {{ include "common.name" . }}-dmaap
+          configMap:
+            name: {{ include "common.fullname" . }}-dmaap
+        - name: {{ include "common.name" . }}-dcaelocations
+          configMap:
+            name: {{ include "common.fullname" . }}-dcaelocations
+        - name: {{ include "common.name" . }}-mrclusters
+          configMap:
+            name: {{ include "common.fullname" . }}-mrclusters
+        - name: {{ include "common.name" . }}-topics
+          configMap:
+            name: {{ include "common.fullname" . }}-topics
+        - name: {{ include "common.name" . }}-feeds
+          configMap:
+            name: {{ include "common.fullname" . }}-feeds
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"