summaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap/charts
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-10-11 14:58:00 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-10-11 15:59:33 +0000
commitae46ee4ae5e7e4bfa2e131f27a93eca4835e070d (patch)
treeefa527a89d4743e3e9980df404aaeceaede7b899 /kubernetes/dmaap/charts
parent0f14e168d05d8a8527913b14b10f9202152f0c5a (diff)
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>
Diffstat (limited to 'kubernetes/dmaap/charts')
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml5
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml2
2 files changed, 5 insertions, 2 deletions
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 778005db45..20265e017e 100644
--- 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 e79a693382..39ecb8f8ac 100644
--- 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