Adding configs for executive collector

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

@@ -99,8 +99,21 @@ openshift_cluster_content:
         - all
   - object: Deployments
     content:
-    - name: MongoDB
+    - name: Hygieia DB
       template: "openshift//mongodb-persistent"
+      params_from_vars:
+        MONGODB_DATABASE: hygieiadb
+        DATABASE_SERVICE_NAME: mongo-hygieia
+      action: create
+      namespace: "{{ k8s_namespace }}"
+      tags:
+        - unpriv
+        - all
+    - name: Executive DB
+      template: "openshift//mongodb-persistent"
+      params_from_vars:
+        MONGODB_DATABASE: execdb
+        DATABASE_SERVICE_NAME: mongo-exec
       action: create
       namespace: "{{ k8s_namespace }}"
       tags:
@@ -118,6 +131,7 @@ openshift_cluster_content:
       params_from_vars:
         COMPONENT: api
         JAR_NAME: api
+        DATABASE_SERVICE_NAME: mongo-hygieia
       namespace: "{{ k8s_namespace }}"
       tags:
         - unpriv
@@ -127,6 +141,7 @@ openshift_cluster_content:
       params_from_vars:
         COMPONENT: api-audit
         JAR_NAME: apiaudit
+        DATABASE_SERVICE_NAME: mongo-hygieia
       namespace: "{{ k8s_namespace }}"
       tags:
         - unpriv
@@ -148,6 +163,7 @@ openshift_cluster_content:
         NAMESPACE: "{{ k8s_namespace }}"
         JENKINS_NAMESPACE: "{{ jenkins_namespace }}"
         OPENSHIFT_DEFAULT_SUBDOMAIN: "{{ openshift_default_subdomain }}"
+        DATABASE_SERVICE_NAME: mongo-hygieia
       tags:
         - unpriv
         - all
@@ -157,6 +173,7 @@ openshift_cluster_content:
       params_from_vars:
         NAMESPACE: "{{ k8s_namespace }}"
         GITHUB_PERSONAL_ACCESS_TOKEN: "{{ github_personal_access_token }}"
+        DATABASE_SERVICE_NAME: mongo-hygieia
       tags:
         - unpriv
         - all
@@ -165,16 +182,19 @@ openshift_cluster_content:
       params_from_vars:
         COMPONENT: exec-api
         JAR_NAME: exec-api
+        DATABASE_SERVICE_NAME: mongo-exec
       namespace: "{{ k8s_namespace }}"
       tags:
         - unpriv
         - all
     - name: Executive Collector
-      template: "{{ inventory_dir }}/../.openshift/templates/deployment-java-component.yml"
+      template: "{{ inventory_dir }}/../.openshift/templates/deployment-exec-collector.yml"
       params_from_vars:
         COMPONENT: exec-analysis
         JAR_NAME: exec-analysis
         JAR_VERSION: -1.0.0-SNAPSHOT
+        DATABASE_SERVICE_NAME: mongo-exec
+        OTHER_DATABASE_SERVICE_NAME: mongo-hygieia
       namespace: "{{ k8s_namespace }}"
       tags:
         - unpriv

hygieia/.openshift/templates/deployment-exec-collector.yml

@@ -0,0 +1,121 @@
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: deployment-${COMPONENT}
+objects:
+- apiVersion: v1
+  kind: DeploymentConfig
+  metadata:
+    creationTimestamp: null
+    generation: 1
+    labels:
+      app: ${COMPONENT}
+    name: ${COMPONENT}
+  spec:
+    replicas: 1
+    selector:
+      deploymentconfig: ${COMPONENT}
+    strategy:
+      activeDeadlineSeconds: 21600
+      resources: {}
+      rollingParams:
+        intervalSeconds: 1
+        maxSurge: 25%
+        maxUnavailable: 25%
+        timeoutSeconds: 600
+        updatePeriodSeconds: 1
+      type: Rolling
+    template:
+      metadata:
+        creationTimestamp: null
+        labels:
+          app: ${COMPONENT}
+          deploymentconfig: ${COMPONENT}
+      spec:
+        containers:
+        - env:
+          - name: JAVA_APP_JAR
+            value: ${JAR_NAME}${JAR_VERSION}.jar
+          - name: DBHOST
+            value: ${DATABASE_SERVICE_NAME}
+          - name: DBNAME
+            valueFrom:
+              secretKeyRef:
+                name: ${DATABASE_SERVICE_NAME}
+                key: database-name
+          - name: DBUSERNAME
+            valueFrom:
+              secretKeyRef:
+                name: ${DATABASE_SERVICE_NAME}
+                key: database-user
+          - name: DBPASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: ${DATABASE_SERVICE_NAME}
+                key: database-password
+          - name: PORTFOLIO_CRON
+            value: 0 * * * * *
+          - name: PORTFOLIO_READURIDATABASE
+            value: ${OTHER_DATABASE_SERVICE_NAME}
+          - name: PORTFOLIO_READDATABASE
+            valueFrom:
+              secretKeyRef:
+                name: ${OTHER_DATABASE_SERVICE_NAME}
+                key: database-name
+          - name: PORTFOLIO_READURIUSERNAME
+            valueFrom:
+              secretKeyRef:
+                name: ${OTHER_DATABASE_SERVICE_NAME}
+                key: database-user
+          - name: PORTFOLIO_READURIPASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: ${OTHER_DATABASE_SERVICE_NAME}
+                key: database-password
+          image: ${COMPONENT}:latest
+          imagePullPolicy: Always
+          name: ${COMPONENT}
+          ports:
+          - containerPort: 8080
+            protocol: TCP
+          - containerPort: 8443
+            protocol: TCP
+          - containerPort: 8778
+            protocol: TCP
+          resources: {}
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        schedulerName: default-scheduler
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+    test: false
+    triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - ${COMPONENT}
+        from:
+          kind: ImageStreamTag
+          name: ${COMPONENT}:latest
+      type: ImageChange
+    - type: ConfigChange
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: ${COMPONENT}-service
+  spec:
+    selector:
+      app: ${COMPONENT}
+    ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+parameters:
+  - name: COMPONENT
+  - name: JAR_NAME
+  - name: JAR_VERSION
+  - name: DATABASE_SERVICE_NAME
+  - name: OTHER_DATABASE_SERVICE_NAME

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

@@ -38,24 +38,24 @@ objects:
           - name: JAVA_APP_JAR
             value: ${JAR_NAME}${JAR_VERSION}.jar
           - name: DBHOST
-            value: mongodb
+            value: ${DATABASE_SERVICE_NAME}
           - name: DBNAME
             valueFrom:
               secretKeyRef:
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
                 key: database-name
           - name: DBUSERNAME
             valueFrom:
               secretKeyRef:
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
                 key: database-user
           - name: DBPASSWORD
             valueFrom:
               secretKeyRef:
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
                 key: database-password
           - name: PORTFOLIO_CRON
-            value: 0 0/30 * * * *
+            value: 0 * * * * *
           image: ${COMPONENT}:latest
           imagePullPolicy: Always
           name: ${COMPONENT}
@@ -100,3 +100,4 @@ parameters:
   - name: COMPONENT
   - name: JAR_NAME
   - name: JAR_VERSION
+  - name: DATABASE_SERVICE_NAME

hygieia/.openshift/templates/hygieia-github-collector-deployment.yml

@@ -39,14 +39,14 @@ objects:
             valueFrom:
               secretKeyRef:
                 key: database-name
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: DBPASSWORD
             valueFrom:
               secretKeyRef:
                 key: database-password
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: DBHOST
-            value: mongodb.${NAMESPACE}.svc
+            value: ${DATABASE_SERVICE_NAME}.${NAMESPACE}.svc
           - name: GITHUB_CRON
             value: 5 * * * * *
           - name: GITHUB_HOST
@@ -61,7 +61,7 @@ objects:
             valueFrom:
               secretKeyRef:
                 key: database-user
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: LOGGING_LEVEL_ROOT
             value: DEBUG
           image: capitalone/hygieia-github-scm-collector:latest
@@ -84,3 +84,4 @@ objects:
 parameters:
 - name: NAMESPACE
 - name: GITHUB_PERSONAL_ACCESS_TOKEN
+- name: DATABASE_SERVICE_NAME

hygieia/.openshift/templates/hygieia-jenkins-build-collector-deployment.yml

@@ -41,14 +41,14 @@ objects:
             valueFrom:
               secretKeyRef:
                 key: database-name
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: DBPASSWORD
             valueFrom:
               secretKeyRef:
                 key: database-password
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: DBHOST
-            value: mongodb.${NAMESPACE}.svc
+            value: ${DATABASE_SERVICE_NAME}.${NAMESPACE}.svc
           - name: JENKINS_CRON
             value: '5 * * * * *'
           - name: JENKINS_SERVERS
@@ -61,7 +61,7 @@ objects:
             valueFrom:
               secretKeyRef:
                 key: database-user
-                name: mongodb
+                name: ${DATABASE_SERVICE_NAME}
           - name: LOGGING_LEVEL_ROOT
             value: INFO
           - name: JENKINS_CLIENT_SECRET
@@ -99,3 +99,4 @@ parameters:
 - name: NAMESPACE
 - name: JENKINS_NAMESPACE
 - name: OPENSHIFT_DEFAULT_SUBDOMAIN
+- name: DATABASE_SERVICE_NAME