Run all components in one namespace

[oom.git] / kubernetes / portal / templates / portal-apps-deployment.yaml

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index b45cec4..e00151c 100755 (executable)
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: portalapps
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-apps
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.portalAppsReplicas }}
   selector:
     matchLabels:
       app: portalapps
@@ -12,7 +13,7 @@ spec:
     metadata:
        labels:
          app: portalapps
-       name: portalapps
+       name: portal-apps
     spec:
       initContainers:
       - command:
@@ -141,10 +142,10 @@ spec:
             name: portal-mariadb-configmap
         - name: portal-root
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal
         - name: portal-logs
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}