Merge "General cleanup of SDNC charts"

4 files changed, 44 insertions, 87 deletions

diff --git a/kubernetes/sdnc/templates/configmap.yaml b/kubernetes/sdnc/templates/configmap.yaml
index 54de05cd61..e9498cb8dc 100644
--- a/kubernetes/sdnc/templates/configmap.yaml
+++ b/kubernetes/sdnc/templates/configmap.yaml
@@ -31,47 +31,15 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-startodl
+  name: {{ include "common.fullname" . }}-bin
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/bin/startODL.sh").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/bin/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-installsdncdb
+  name: {{ include "common.fullname" . }}-properties
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/bin/installSdncDb.sh").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-aaiclient-properties
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/conf/aaiclient.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-dblib-properties
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/conf/dblib.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-svclogic-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/conf/svclogic.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-onap-sdnc-svclogic-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/conf/svclogic.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/sdnc/templates/secrets.yaml b/kubernetes/sdnc/templates/secrets.yaml
index 345c194d96..754f117e38 100644
--- a/kubernetes/sdnc/templates/secrets.yaml
+++ b/kubernetes/sdnc/templates/secrets.yaml
@@ -11,3 +11,17 @@ metadata:
 type: Opaque
 data:
   db-root-password: {{ .Values.config.dbRootPassword | b64enc | quote }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.fullname" . }}-odl
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+type: Opaque
+data:
+  odl-password: {{ .Values.config.odlPassword | b64enc | quote }}
diff --git a/kubernetes/sdnc/templates/service.yaml b/kubernetes/sdnc/templates/service.yaml
index 586144b6e9..a1648c2e30 100644
--- a/kubernetes/sdnc/templates/service.yaml
+++ b/kubernetes/sdnc/templates/service.yaml
@@ -50,6 +50,10 @@ spec:
       targetPort: {{ .Values.service.internalPort3 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
       name: "{{ .Values.service.portName }}-8280"
+    - port: {{ .Values.service.externalPort4 }}
+      targetPort: {{ .Values.service.internalPort4 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort4 }}
+      name: "{{ .Values.service.portName }}-8443"
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index c8565f5e89..63175c4c4b 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -69,6 +69,11 @@ spec:
                 secretKeyRef:
                   name: {{ template "common.fullname" . }}
                   key: db-root-password
+            - name: ODL_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "common.fullname" . }}-odl
+                  key: odl-password
             - name: SDNC_CONFIG_DIR
               value: "{{ .Values.config.configDir }}"
             - name: ENABLE_ODL_CLUSTER
@@ -84,23 +89,23 @@ spec:
           - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
             name: sdnc-logging-cfg-config
             subPath: org.ops4j.pax.logging.cfg
-          - mountPath: /opt/onap/sdnc/bin/startODL.sh
-            name: startodl
+          - mountPath: {{ .Values.config.binDir }}/startODL.sh
+            name: bin
             subPath: startODL.sh
-          - mountPath: /opt/onap/sdnc/bin/installSdncDb.sh
-            name: installsdncdb
+          - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
+            name: bin
             subPath: installSdncDb.sh
-          - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
-            name: aaiclient-conf
+          - mountPath: {{ .Values.config.configDir }}/aaiclient.properties
+            name: properties
             subPath: aaiclient.properties
-          - mountPath: /opt/onap/sdnc/data/properties/dblib.properties
-            name: sdnc-dblib-properties
+          - mountPath: {{ .Values.config.configDir }}/dblib.properties
+            name: properties
             subPath: dblib.properties
-          - mountPath: /opt/onap/sdnc/data/properties/svclogic.properties
-            name: sdnc-svclogic-config
+          - mountPath: {{ .Values.config.configDir }}/svclogic.properties
+            name: properties
             subPath: svclogic.properties
           - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
-            name: onap-sdnc-svclogic-config
+            name: properties
             subPath: svclogic.properties
           - mountPath: {{ .Values.persistence.mdsalPath }}
             name: {{ include "common.fullname" . }}-data
@@ -145,48 +150,14 @@ spec:
         - name: sdnc-logging-cfg-config
           configMap:
             name: {{ include "common.fullname" . }}-log-configmap
-        - name: startodl
-          configMap:
-            name: {{ include "common.fullname" . }}-startodl
-            items:
-            - key: startODL.sh
-              path: startODL.sh
-              mode: 0755
-        - name: installsdncdb
-          configMap:
-            name: {{ include "common.fullname" . }}-installsdncdb
-            items:
-            - key: installSdncDb.sh
-              path: installSdncDb.sh
-              mode: 0755
-        - name: aaiclient-conf
-          configMap:
-            name: {{ include "common.fullname" . }}-aaiclient-properties
-            items:
-            - key: aaiclient.properties
-              path: aaiclient.properties
-              mode: 0644
-        - name: sdnc-dblib-properties
-          configMap:
-            name: {{ include "common.fullname" . }}-dblib-properties
-            items:
-            - key: dblib.properties
-              path: dblib.properties
-              mode: 0644
-        - name: sdnc-svclogic-config
+        - name: bin
           configMap:
-            name: {{ include "common.fullname" . }}-svclogic-config
-            items:
-            - key: svclogic.properties
-              path: svclogic.properties
-              mode: 0644
-        - name: onap-sdnc-svclogic-config
+            name: {{ include "common.fullname" . }}-bin
+            defaultMode: 0755
+        - name: properties
           configMap:
-            name: {{ include "common.fullname" . }}-onap-sdnc-svclogic-config
-            items:
-            - key: svclogic.properties
-              path: svclogic.properties
-              mode: 0644
+            name: {{ include "common.fullname" . }}-properties
+            defaultMode: 0644
   {{ if not .Values.persistence.enabled }}
         - name: {{ include "common.fullname" . }}-data
           emptyDir: {}