Provision clients for PNF topics

[oom.git] / kubernetes / dmaap / charts / dmaap-bus-controller / templates / deployment.yaml

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 20265e0..9cf147f 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -50,9 +50,6 @@ spec:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          envFrom:
-          - configMapRef:
-              name: {{ include "common.fullname" . }}-config
           ports:
           - containerPort: {{ .Values.service.internalPort }}
           - containerPort: {{ .Values.service.internalPort2 }}
@@ -62,11 +59,12 @@ spec:
               port: {{ .Values.service.internalPort }}
               path: /webapi/info
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}          
+            periodSeconds: {{ .Values.liveness.periodSeconds }}
           readinessProbe:
             httpGet:
-              port: {{ .Values.service.internalPort }}
-              path: /webapi/info
+              host: {{ .Values.dmaapMessageRouterService }}
+              port: 3904
+              path: /topics
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           {{ end -}}
@@ -74,11 +72,13 @@ spec:
           - 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
           - name: {{ include "common.name" . }}-config
-            mountPath: /opt/app/config/conf
-            subPath: buscontroller.env
+            mountPath: /opt/app/config/conf/
 
-# NOTE: the basename of the subdirectory specified in mountPath is important - it matches the DBCL API URI
+# 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