Run all components in one namespace

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

diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
index 6004193..d5237ca 100644 (file)
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-widgets
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.portalWidgetsReplicas }}
   selector:
     matchLabels:
       app: portalwidgets
@@ -12,7 +13,7 @@ spec:
     metadata:
        labels:
          app: portalwidgets
-       name: portalwidgets
+       name: portal-widgets
     spec:
       initContainers:
       - command:
@@ -31,7 +32,7 @@ spec:
         name: portalapps-readiness
       containers:
       - image: {{ .Values.image.portalwms }}
-        imagePullPolicy: {{ .Values.pullPolicy }} 
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: portalwidgets
         volumeMounts:
         - mountPath: /etc/localtime
@@ -39,6 +40,7 @@ spec:
           readOnly: true
         - mountPath: /application.properties
           name: portalwidgets-application-properties
+          subPath: application.properties
         ports:
         - containerPort: 8082
         readinessProbe:
@@ -51,8 +53,8 @@ spec:
           hostPath:
             path: /etc/localtime
         - name: portalwidgets-application-properties
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
+          configMap:
+            name: portal-onapwidgetms-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}