Adding executive UI

hygieia/.applier/group_vars/seed-hosts.yml

@@ -51,6 +51,8 @@ openshift_cluster_content:
         - all
     - name: UI Builder and Runtime Images
       template: "{{ inventory_dir }}/../.openshift/templates/build-ui.yml"
+      params_from_vars:
+        COMPONENT: ui
       namespace: "{{ k8s_namespace }}"
       tags:
         - unpriv
@@ -84,6 +86,17 @@ openshift_cluster_content:
       tags:
         - unpriv
         - all
+    - name: Executive UI
+      template: "{{ inventory_dir }}/../.openshift/templates/build-exec-ui.yml"
+      params_from_vars:
+        COMPONENT: exec-ui
+        SOURCE_CODE_URL: https://github.com/Hygieia/ExecDashboard.git
+        SOURCE_CODE_REF: master
+        SOURCE_CODE_CONTEXT: /exec-ui
+      namespace: "{{ k8s_namespace }}"
+      tags:
+        - unpriv
+        - all
   - object: Deployments
     content:
     - name: MongoDB
@@ -123,6 +136,7 @@ openshift_cluster_content:
       namespace: "{{ k8s_namespace }}"
       params_from_vars:
         NAMESPACE: "{{ k8s_namespace}}"
+        COMPONENT: ui
         OPENSHIFT_DEFAULT_SUBDOMAIN: "{{ openshift_default_subdomain }}"
       tags:
         - unpriv
@@ -165,3 +179,15 @@ openshift_cluster_content:
       tags:
         - unpriv
         - all
+    - name: Executive UI
+      template: "{{ inventory_dir }}/../.openshift/templates/deployment-ui.yml"
+      namespace: "{{ k8s_namespace }}"
+      params_from_vars:
+        NAMESPACE: "{{ k8s_namespace}}"
+        COMPONENT: exec-ui
+        OPENSHIFT_DEFAULT_SUBDOMAIN: "{{ openshift_default_subdomain }}"
+        HOST: executive
+        API_HOST: exec-ui
+      tags:
+        - unpriv
+        - all

hygieia/.openshift/templates/build-exec-ui.yml

@@ -0,0 +1,120 @@
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: build-${COMPONENT}
+objects:
+- apiVersion: v1
+  kind: ImageStream
+  metadata:
+    annotations:
+    creationTimestamp: null
+    generation: 1
+    labels:
+      app: ${COMPONENT}
+    name: build-${COMPONENT}
+- apiVersion: v1
+  kind: BuildConfig
+  metadata:
+    creationTimestamp: null
+    labels:
+      app: ${COMPONENT}
+    name: build-${COMPONENT}
+  spec:
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: build-${COMPONENT}:latest
+    postCommit: {}
+    resources: {}
+    runPolicy: Serial
+    source:
+      contextDir: ${SOURCE_CODE_CONTEXT}
+      git:
+        ref: ${SOURCE_CODE_REF}
+        uri: ${SOURCE_CODE_URL}
+      type: Git
+    strategy:
+      sourceStrategy:
+        from:
+          kind: ImageStreamTag
+          name: nodejs:8
+          namespace: openshift
+      type: Source
+    triggers:
+    - imageChange: {}
+      type: ImageChange
+    - type: ConfigChange
+    - generic:
+        secret: 019d3db99764e75e
+      type: Generic
+    - github:
+        secret: dca9639337f3d252
+      type: GitHub
+  status:
+    lastVersion: 0
+- apiVersion: v1
+  kind: ImageStream
+  metadata:
+    annotations:
+      labels:
+        app: ${COMPONENT}
+    name: ${COMPONENT}
+    spec:
+      lookupPolicy:
+        local: false
+- apiVersion: v1
+  kind: BuildConfig
+  metadata:
+    creationTimestamp: null
+    labels:
+      app: ${COMPONENT}
+    name: ${COMPONENT}
+  spec:
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: ${COMPONENT}:latest
+    postCommit: {}
+    resources: {}
+    runPolicy: Serial
+    source:
+      images:
+      - as: null
+        from:
+          kind: ImageStreamTag
+          name: build-${COMPONENT}:latest
+        paths:
+        - destinationDir: .
+          sourcePath: /opt/app-root/src/dist/.
+      type: Image
+    strategy:
+      sourceStrategy:
+        from:
+          kind: ImageStreamTag
+          name: nginx:latest
+          namespace: openshift
+      type: Source
+    successfulBuildsHistoryLimit: 5
+    triggers:
+    - imageChange: {}
+      type: ImageChange
+    - type: ConfigChange
+    - generic:
+        secret: 767b7d2dbfffde5d
+      type: Generic
+    - github:
+        secret: 1ba0322210651c63
+      type: GitHub
+  status:
+    lastVersion: 0
+parameters:
+  - name: COMPONENT
+  - name: SOURCE_CODE_URL
+    value: https://github.com/tomgeorge/Hygieia
+  - name: SOURCE_CODE_REF
+    value: override-default-nginx-conf
+  - name: SOURCE_CODE_CONTEXT
+    value: /UI

hygieia/.openshift/templates/build-ui.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Template
 metadata:
   creationTimestamp: null
-  name: build-ui
+  name: build-${COMPONENT}
 objects:
 - apiVersion: v1
   kind: ImageStream
@@ -11,42 +11,29 @@ objects:
     creationTimestamp: null
     generation: 1
     labels:
-      build: build-ui
-    name: build-ui
-  spec:
-    lookupPolicy:
-      local: false
-    tags:
-    - annotations: null
-      from:
-        kind: DockerImage
-        name: docker-registry.default.svc:5000/hygieia/build-ui:latest
-      generation: null
-      importPolicy: {}
-      name: latest
-      referencePolicy:
-        type: ""
+      app: ${COMPONENT}
+    name: build-${COMPONENT}
 - apiVersion: v1
   kind: BuildConfig
   metadata:
     creationTimestamp: null
     labels:
-      app: ui
-    name: build-ui
+      app: ${COMPONENT}
+    name: build-${COMPONENT}
   spec:
     nodeSelector: null
     output:
       to:
         kind: ImageStreamTag
-        name: build-ui:latest
+        name: build-${COMPONENT}:latest
     postCommit: {}
     resources: {}
     runPolicy: Serial
     source:
-      contextDir: /UI
+      contextDir: ${SOURCE_CODE_CONTEXT}
       git:
-        ref: override-default-nginx-conf
-        uri: https://github.com/tomgeorge/Hygieia
+        ref: ${SOURCE_CODE_REF}
+        uri: ${SOURCE_CODE_URL}
       type: Git
     strategy:
       sourceStrategy:
@@ -72,8 +59,8 @@ objects:
   metadata:
     annotations:
       labels:
-        build: ui
-    name: ui
+        app: ${COMPONENT}
+    name: ${COMPONENT}
     spec:
       lookupPolicy:
         local: false
@@ -82,14 +69,14 @@ objects:
   metadata:
     creationTimestamp: null
     labels:
-      app: ui
-    name: ui
+      app: ${COMPONENT}
+    name: ${COMPONENT}
   spec:
     nodeSelector: null
     output:
       to:
         kind: ImageStreamTag
-        name: ui:latest
+        name: ${COMPONENT}:latest
     postCommit: {}
     resources: {}
     runPolicy: Serial
@@ -98,7 +85,7 @@ objects:
       - as: null
         from:
           kind: ImageStreamTag
-          name: build-ui:latest
+          name: build-${COMPONENT}:latest
         paths:
         - destinationDir: .
           sourcePath: /opt/app-root/src/dist/.
@@ -127,3 +114,11 @@ objects:
       type: GitHub
   status:
     lastVersion: 0
+parameters:
+  - name: COMPONENT
+  - name: SOURCE_CODE_URL
+    value: https://github.com/tomgeorge/Hygieia
+  - name: SOURCE_CODE_REF
+    value: override-default-nginx-conf
+  - name: SOURCE_CODE_CONTEXT
+    value: /UI

hygieia/.openshift/templates/deployment-java-component.yml

@@ -54,6 +54,8 @@ objects:
               secretKeyRef:
                 name: mongodb
                 key: database-password
+          - name: PORTFOLIO_CRON
+            value: 0 0/30 * * * *
           image: ${COMPONENT}:latest
           imagePullPolicy: Always
           name: ${COMPONENT}

hygieia/.openshift/templates/deployment-ui.yml

@@ -10,12 +10,12 @@ objects:
     creationTimestamp: null
     generation: 1
     labels:
-      app: ui
-    name: ui
+      app: ${COMPONENT}
+    name: ${COMPONENT}
   spec:
     replicas: 1
     selector:
-      deploymentconfig: ui
+      deploymentconfig: ${COMPONENT}
     strategy:
       activeDeadlineSeconds: 21600
       resources: {}
@@ -30,18 +30,18 @@ objects:
       metadata:
         creationTimestamp: null
         labels:
-          app: ui
-          deploymentconfig: ui
+          app: ${COMPONENT}
+          deploymentconfig: ${COMPONENT}
       spec:
         containers:
         - env:
           - name: API_PORT
             value: "8080"
           - name: API_HOST
-            value: api-service.${NAMESPACE}.svc
-          image: ui:latest
+            value: ${API_HOST}.${NAMESPACE}.svc
+          image: ${COMPONENT}:latest
           imagePullPolicy: Always
-          name: ui
+          name: ${COMPONENT}
           ports:
           - containerPort: 8080
             protocol: TCP
@@ -58,32 +58,37 @@ objects:
     - imageChangeParams:
         automatic: true
         containerNames:
-        - ui
+        - ${COMPONENT}
         from:
           kind: ImageStreamTag
-          name: ui:latest
+          name: ${COMPONENT}:latest
       type: ImageChange
     - type: ConfigChange
 - apiVersion: v1
   kind: Route
   metadata:
-    name: ui-route
+    name: ${COMPONENT}-route
   spec:
-    host: hygieia.${NAMESPACE}.${OPENSHIFT_DEFAULT_SUBDOMAIN}
+    host: ${HOST}.${NAMESPACE}.${OPENSHIFT_DEFAULT_SUBDOMAIN}
     to:
       kind: Service
-      name: ui-service
+      name: ${COMPONENT}-service
 - apiVersion: v1
   kind: Service
   metadata:
-    name: ui-service
+    name: ${COMPONENT}-service
   spec:
     selector:
-      app: ui
+      app: ${COMPONENT}
     ports:
     - protocol: TCP
       port: 8080
       targetPort: 8080
 parameters:
 - name: NAMESPACE
 - name: OPENSHIFT_DEFAULT_SUBDOMAIN
+- name: COMPONENT
+- name: HOST
+  value: hygieia
+- name: API_HOST
+  value: api-service