From 8234007f37c917b1334a1613f90ca61d85c24cdc Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Tue, 16 Oct 2018 21:53:34 +0000 Subject: Set properties using k8s configmap Change-Id: I1e32231f468dc00f089f51dc6a70c4d1970e507f Signed-off-by: dglFromAtt Issue-ID: DMAAP-829 --- .../dmaap/charts/dmaap-bus-controller/templates/deployment.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'kubernetes/dmaap/charts/dmaap-bus-controller/templates') diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml index 20265e017e..c2c72a421e 100644 --- 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 }} @@ -75,10 +72,10 @@ spec: name: localtime readOnly: true - name: {{ include "common.name" . }}-config - mountPath: /opt/app/config/conf - subPath: buscontroller.env + mountPath: /opt/app/config/conf/ +# subPath: buscontroller.env -# 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 -- cgit From ec0918d6eeefdba962699e121240f532cb26b66c Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Wed, 17 Oct 2018 19:34:49 +0000 Subject: Corrections and additions Change-Id: I3b0a7ee34dcae30cdc1faa42e05455aa4e693df6 Signed-off-by: dglFromAtt Issue-ID: DMAAP-829 --- .../dmaap/charts/dmaap-bus-controller/templates/deployment.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kubernetes/dmaap/charts/dmaap-bus-controller/templates') diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml index c2c72a421e..8ef03d43a9 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml @@ -59,7 +59,7 @@ 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 }} @@ -71,9 +71,11 @@ 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 # NOTE: the basename of the subdirectory is important - it matches the DBCL API URI - name: {{ include "common.name" . }}-dmaap -- cgit