Run all components in one namespace

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

1 files changed, 69 insertions, 6 deletions

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 }}