Run all components in one namespace

[oom.git] / kubernetes / sdnc / templates / web-deployment.yaml

diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml
index fcd82a4..968ec8d 100644 (file)
--- a/kubernetes/sdnc/templates/web-deployment.yaml
+++ b/kubernetes/sdnc/templates/web-deployment.yaml
@@ -3,8 +3,9 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: sdnc-portal
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.portalReplicas }}
   selector:
     matchLabels:
       app: sdnc-portal
@@ -50,10 +51,8 @@ spec:
         - name: localtime
           mountPath: /etc/localtime
           readOnly: true
-        - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
-          name: sdnc-aaiclient-properties
-        - mountPath: /opt/onap/sdnc/data/properties/admportal.json
-          name: sdnc-admportal-json
+        - mountPath: /opt/onap/sdnc/data/properties/
+          name: sdnc-conf
         readinessProbe:
           tcpSocket:
             port: 8843
@@ -64,12 +63,9 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: sdnc-aaiclient-properties
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
-      - name: sdnc-admportal-json
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
+      - name: sdnc-conf
+        configMap:
+          name: sdnc-conf-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}