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 5b020e5..d5237ca 100644 (file)
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disablePortalPortalwidgets }}
 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
@@ -11,41 +13,34 @@ spec:
     metadata:
        labels:
          app: portalwidgets
-       name: portalwidgets
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "portaldb"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "portalapps-readiness"
-           }
-           ]'
+       name: portal-widgets
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - portaldb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: portalapps-readiness
       containers:
       - image: {{ .Values.image.portalwms }}
-        imagePullPolicy: {{ .Values.pullPolicy }} 
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: portalwidgets
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /application.properties
           name: portalwidgets-application-properties
+          subPath: application.properties
         ports:
         - containerPort: 8082
         readinessProbe:
@@ -54,8 +49,12 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-        - name: portalwidgets-application-properties
+        - name: localtime
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
+            path: /etc/localtime
+        - name: portalwidgets-application-properties
+          configMap:
+            name: portal-onapwidgetms-configmap
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}