improvements for configmap

includes:
- set environment using configmap
- use new docker image produced without Dockerfile (per Nokia)

Change-Id: Iff0468e6ca0fdb4b1a377b23a26397e5d20f40f7
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-829
Signed-off-by: dglFromAtt <dgl@research.att.com>

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 778005d..20265e0 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -50,6 +50,9 @@ 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 }}
@@ -75,7 +78,7 @@ spec:
             mountPath: /opt/app/config/conf
             subPath: buscontroller.env
 
-# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
+# NOTE: the basename of the subdirectory specified in mountPath is important - it matches the DBCL API URI
           - name: {{ include "common.name" . }}-dmaap
             mountPath: /opt/app/config/dmaap/
           - name: {{ include "common.name" . }}-dcaelocations

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index e79a693..39ecb8f 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,7 +31,7 @@ pullPolicy: Always
 # application images
 repository: nexus3.onap.org:10001
 
-image: onap/dmaap/buscontroller:1.0.19
+image: onap/dmaap/buscontroller:1.0.20
 
 
 # application configuration