diff options
| author |   ac2550 <ac2550@intl.att.com> | 2018-05-16 14:31:23 +0200 |
|---|---|---|
| committer | ac2550 <ac2550@intl.att.com> | 2018-05-16 14:45:12 +0200 |
| commit | 7895b2c497441724a011f7139e82fd6edc5de042 (patch) | |
| tree | f35580e4320866e74ec510ed452e004c0a2ab85c /kubernetes/clamp/templates | |
| parent | 3ebcf63048e23725ef3821bd10a3ba5f5702a620 (diff) | |
Clamp cannot connect to SDC
Change-Id: Ib55827b52a4b46001ed15518efdec36756f99dfa
Issue-ID: CLAMP-151
Signed-off-by: ac2550 <ac2550@intl.att.com>
Diffstat (limited to 'kubernetes/clamp/templates')
| -rw-r--r-- | kubernetes/clamp/templates/configmap.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/clamp/templates/deployment.yaml | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/kubernetes/clamp/templates/configmap.yaml b/kubernetes/clamp/templates/configmap.yaml index bee8f132ea..7a66c64755 100644 --- a/kubernetes/clamp/templates/configmap.yaml +++ b/kubernetes/clamp/templates/configmap.yaml @@ -23,4 +23,5 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - spring_application_json: {{ tpl .Values.config.springApplicationJson . | quote }} +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} + spring_application_json: {{ tpl .Values.config.springApplicationJson . | quote }} diff --git a/kubernetes/clamp/templates/deployment.yaml b/kubernetes/clamp/templates/deployment.yaml index 4a3a0f9e4f..38eabeb968 100644 --- a/kubernetes/clamp/templates/deployment.yaml +++ b/kubernetes/clamp/templates/deployment.yaml @@ -65,6 +65,10 @@ spec: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + volumeMounts: + - mountPath: /opt/clamp/sdc-controllers-config.json + name: {{ include "common.fullname" . }}-config + subPath: sdc-controllers-config.json env: - name: SPRING_APPLICATION_JSON valueFrom: @@ -81,5 +85,12 @@ spec: affinity: {{ toYaml .Values.affinity | indent 10 }} {{- end }} + volumes: + - name: {{ include "common.fullname" . }}-config + configMap: + name: {{ include "common.fullname" . }} + items: + - key: sdc-controllers-config.json + path: sdc-controllers-config.json imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |