diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-10-15 11:29:06 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-15 11:29:06 +0000 |
commit | b7d8e097d97c5d6bc6d55d841c388a2abbeeae61 (patch) | |
tree | e9f85139ee995db7c3dc4be64e29fe17e0708bff | |
parent | 8280cc95197f75e38ba8cd963575cc34cfbb0184 (diff) | |
parent | ae46ee4ae5e7e4bfa2e131f27a93eca4835e070d (diff) |
Merge "improvements for configmap"
-rw-r--r-- | kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml | 5 | ||||
-rw-r--r-- | kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml | 2 |
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 |