diff options
| author |   jmac <james.macnider@amdocs.com> | 2018-05-10 22:44:19 +0000 |
|---|---|---|
| committer | jmac <james.macnider@amdocs.com> | 2018-05-11 14:23:48 +0000 |
| commit | a68f4cb5db47f41deac439b9ef90065e023af3fe (patch) | |
| tree | 2aa0ac20a039f901a029ef2570c1b1a8977b102d /kubernetes/sdnc/charts/sdnc-portal/templates | |
| parent | 463c20ba29c4d6723c0a176967b492d1d28196ae (diff) | |
General cleanup of SDNC charts
Addressing issues like:
- missing property files
- hard-coded ports
- hard-coded ODL passwords
- improper configMap mounts
- incorrect service names
Change-Id: I74726ffedbfc20e164a814ca8777a699b92b3d65
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: SDNC-310
Diffstat (limited to 'kubernetes/sdnc/charts/sdnc-portal/templates')
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml | 22 |
2 files changed, 19 insertions, 5 deletions
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml index fe08a96b39..f57dc78107 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.fullname" . }}-portal + name: {{ include "common.fullname" . }} namespace: {{ include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml index b456d8ee91..87ed6aa283 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml @@ -81,8 +81,21 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: {{ .Values.config.configDir }} - name: {{ include "common.fullname" . }}-portal + - mountPath: {{ .Values.config.configDir }}/admportal.json + name: properties + subPath: admportal.json + - mountPath: {{ .Values.config.configDir }}/dblib.properties + name: properties + subPath: dblib.properties + - mountPath: {{ .Values.config.configDir }}/svclogic.properties + name: properties + subPath: svclogic.properties + - mountPath: {{ .Values.config.configDir }}/svclogic.properties.sdnctldb01 + name: properties + subPath: svclogic.properties + - mountPath: {{ .Values.config.configDir }}/svclogic.properties.sdnctldb02 + name: properties + subPath: svclogic.properties.sdnctldb02 resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} @@ -97,8 +110,9 @@ spec: - name: localtime hostPath: path: /etc/localtime - - name: {{ include "common.fullname" . }}-portal + - name: properties configMap: - name: {{ include "common.fullname" . }}-portal + name: {{ include "common.fullname" . }} + defaultMode: 0644 imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |