From a68f4cb5db47f41deac439b9ef90065e023af3fe Mon Sep 17 00:00:00 2001
From: jmac <james.macnider@amdocs.com>
Date: Thu, 10 May 2018 22:44:19 +0000
Subject: 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
---
 .../charts/sdnc-portal/templates/configmap.yaml    |  2 +-
 .../charts/sdnc-portal/templates/deployment.yaml   | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'kubernetes/sdnc/charts/sdnc-portal/templates')

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"
-- 
cgit 1.2.3-korg