Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

9 files changed, 197 insertions, 34 deletions

diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml
index 8f7ed19ae1..b6d40d75c0 100644
--- a/kubernetes/appc/templates/all-services.yaml
+++ b/kubernetes/appc/templates/all-services.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: dbhost
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: appc-dbhost
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: appc-dbhost
 spec:
@@ -17,8 +17,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnctldb01
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: appc-sdnctldb01
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: appc-dbhost
 spec:
@@ -31,8 +31,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnctldb02
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: appc-sdnctldb02
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: appc-dbhost
 spec:
@@ -47,8 +47,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnhost
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: appc-sdnhost
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: appc
 spec:
@@ -70,7 +70,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dgbuilder
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: appc-dgbuilder
 spec:
@@ -82,4 +82,4 @@ spec:
   type: NodePort
   selector:
     app: appc-dgbuilder
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/appc/templates/appc-conf-configmap.yaml b/kubernetes/appc/templates/appc-conf-configmap.yaml
deleted file mode 100644
index 0e418d1e7a..0000000000
--- a/kubernetes/appc/templates/appc-conf-configmap.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-#{{ if not .Values.disableAppcAppc }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: appc-conf-configmap
-  namespace: {{ .Values.nsPrefix }}-appc
-data:
-{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }}
-#{{ end }}
diff --git a/kubernetes/appc/templates/appc-configmap.yaml b/kubernetes/appc/templates/appc-configmap.yaml
new file mode 100644
index 0000000000..8d00842183
--- /dev/null
+++ b/kubernetes/appc/templates/appc-configmap.yaml
@@ -0,0 +1,73 @@
+#{{ if not .Values.disableAppcAppc }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-openecomp-appc-data-properties-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/data/properties/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-openecomp-appc-svclogic-config-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/svclogic/config/svclogic.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-openecomp-appc-svclogic-bin-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-openecomp-appc-bin-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/bin/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-onap-sdnc-data-properties-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/data/properties/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-onap-sdnc-svclogic-config-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/config/svclogic.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-onap-sdnc-svclogic-bin-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-onap-sdnc-bin-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/bin/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-scripts-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/scripts/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 35e947093c..78bef5e22d 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.appcReplicas }}
   selector:
@@ -42,6 +42,8 @@ spec:
           value: /opt/openecomp/appc/data/properties
         - name: DMAAP_TOPIC_ENV
           value: SUCCESS
+        - name: MYSQL_HOST
+          value: appc-dbhost
         image: {{ .Values.image.appc }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: appc-controller-container
@@ -49,15 +51,51 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: /opt/openecomp/appc/data/properties/dblib.properties
+          name: appc-openecomp-appc-data-properties
+          subPath: dblib.properties
+        - mountPath: /opt/openecomp/appc/data/properties/svclogic.properties
+          name: appc-openecomp-appc-data-properties
+          subPath: svclogic.properties
         - mountPath: /opt/openecomp/appc/data/properties/appc.properties
-          name: appc-conf
+          name: appc-openecomp-appc-data-properties
           subPath: appc.properties
         - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties
-          name: appc-conf
+          name: appc-openecomp-appc-data-properties
           subPath: aaiclient.properties
+        - mountPath: /opt/openecomp/appc/svclogic/config/svclogic.properties
+          name: appc-openecomp-appc-svclogic-config
+          subPath: svclogic.properties
+        - mountPath: /opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh
+          name: appc-openecomp-appc-svclogic-bin
+          subPath: showActiveGraphs.sh
+        - mountPath: /opt/openecomp/appc/bin/startODL.sh
+          name: appc-openecomp-appc-bin
+          subPath: startODL.sh
+        - mountPath: /opt/openecomp/appc/bin/installAppcDb.sh
+          name: appc-openecomp-appc-bin
+          subPath: installAppcDb.sh
+        - mountPath: /opt/onap/sdnc/data/properties/dblib.properties
+          name: appc-onap-sdnc-data-properties
+          subPath: dblib.properties
+        - mountPath: /opt/onap/sdnc/data/properties/svclogic.properties
+          name: appc-onap-sdnc-data-properties
+          subPath: svclogic.properties
         - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
-          name: appc-conf
+          name: appc-onap-sdnc-data-properties
           subPath: aaiclient.properties
+        - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
+          name: appc-onap-sdnc-svclogic-config
+          subPath: svclogic.properties
+        - mountPath: /opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh
+          name: appc-onap-sdnc-svclogic-bin
+          subPath: showActiveGraphs.sh
+        - mountPath: /opt/onap/sdnc/bin/startODL.sh
+          name: appc-onap-sdnc-bin
+          subPath: startODL.sh
+        - mountPath: /opt/onap/sdnc/bin/installSdncDb.sh
+          name: appc-onap-sdnc-bin
+          subPath: installSdncDb.sh
         - mountPath: /var/log/onap
           name: appc-logs
         - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
@@ -96,9 +134,34 @@ spec:
           emptyDir: {}
         - name: appc-data-filebeat
           emptyDir: {}
-        - name: appc-conf
+        - name: appc-openecomp-appc-data-properties
           configMap:
-            name: appc-conf-configmap
+            name: appc-openecomp-appc-data-properties-configmap
+        - name: appc-openecomp-appc-svclogic-config
+          configMap:
+            name: appc-openecomp-appc-svclogic-config-configmap
+        - name: appc-openecomp-appc-svclogic-bin
+          configMap:
+            name: appc-openecomp-appc-svclogic-bin-configmap
+            defaultMode: 0755
+        - name: appc-openecomp-appc-bin
+          configMap:
+            name: appc-openecomp-appc-bin-configmap
+            defaultMode: 0755
+        - name: appc-onap-sdnc-data-properties
+          configMap:
+            name: appc-onap-sdnc-data-properties-configmap
+        - name: appc-onap-sdnc-svclogic-config
+          configMap:
+            name: appc-onap-sdnc-svclogic-config-configmap
+        - name: appc-onap-sdnc-svclogic-bin
+          configMap:
+            name: appc-onap-sdnc-svclogic-bin-configmap
+            defaultMode: 0755
+        - name: appc-onap-sdnc-bin
+          configMap:
+            name: appc-onap-sdnc-bin-configmap
+            defaultMode: 0755
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}
diff --git a/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml b/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml
new file mode 100644
index 0000000000..f846c199a1
--- /dev/null
+++ b/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml
@@ -0,0 +1,17 @@
+#{{ if not .Values.disableAppcAppc }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-dgbuilder-conf-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/dgbuilder/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: appc-dgbuilder-scripts-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/scripts/dgbuilder/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/appc/templates/appc-log-configmap.yaml b/kubernetes/appc/templates/appc-log-configmap.yaml
index 323f852779..9e102e1b88 100644
--- a/kubernetes/appc/templates/appc-log-configmap.yaml
+++ b/kubernetes/appc/templates/appc-log-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: appc-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}-appc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }}
 ---
@@ -11,7 +11,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: appc-logging-cfg-configmap
-  namespace: {{ .Values.nsPrefix }}-appc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml
index bb2716cddb..ff0f89af49 100644
--- a/kubernetes/appc/templates/appc-pv-pvc.yaml
+++ b/kubernetes/appc/templates/appc-pv-pvc.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: "{{ .Values.nsPrefix }}-appc-db"
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: "{{ .Values.nsPrefix }}-appc-db"
+    name: "{{ .Values.nsPrefix }}-appc"
 spec:
   capacity:
     storage: 2Gi
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: appc-db
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -28,5 +28,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: "{{ .Values.nsPrefix }}-appc-db"
+      name: "{{ .Values.nsPrefix }}-appc"
 #{{ end }}
diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml
index 0b29393cb5..41d9d5b520 100644
--- a/kubernetes/appc/templates/db-deployment.yaml
+++ b/kubernetes/appc/templates/db-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc-dbhost
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.dbReplicas }}
   selector:
diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index 3bbc6715aa..fe9a198aef 100644
--- a/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc-dgbuilder
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.dgbuilderReplicas }}
   selector:
@@ -56,10 +56,29 @@ spec:
         - name: localtime
           mountPath: /etc/localtime
           readOnly: true
+        - name: dgbuilder-conf
+          mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/conf/svclogic.properties
+          subPath: svclogic.properties
+        - name: dgbuilder-conf
+          mountPath: /opt/onap/sdnc/dgbuilder/svclogic/svclogic.properties
+          subPath: svclogic.properties
+        - name: dgbuilder-scripts
+          mountPath: /opt/onap/sdnc/dgbuilder/createReleaseDir.sh
+          subPath: createReleaseDir.sh
+        - name: dgbuilder-scripts
+          mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/customSettings.js
+          subPath: customSettings.js
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
+      - name: dgbuilder-conf
+        configMap:
+          name: appc-dgbuilder-conf-configmap
+      - name: dgbuilder-scripts
+        configMap:
+          name: appc-dgbuilder-scripts-configmap
+          defaultMode: 0755
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"