Merge pull request redhat-cop#4 from tomgeorge/add-jenkins-collector

Add jenkins collector
pcarney8 · Nov 6, 2018 · 6d9f798 · 6d9f798
2 parents 876fced + f130982
commit 6d9f798
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 2 deletions.
diff --git a/hygieia/.applier/group_vars/seed-hosts.yml b/hygieia/.applier/group_vars/seed-hosts.yml
@@ -49,6 +49,13 @@ openshift_cluster_content:
       tags:
         - unpriv
         - all
+    - name: Jenkins
+      template: "openshift//jenkins-persistent"
+      action: create
+      namespace: "{{ k8s_namespace }}"
+      tags:
+        - unpriv
+        - all
     - name: API
       template: "{{ inventory_dir }}/../.openshift/templates/deployment-api.yml"
       namespace: "{{ k8s_namespace }}"
@@ -64,6 +71,17 @@ openshift_cluster_content:
     - name: UI
       template: "{{ inventory_dir }}/../.openshift/templates/deployment-ui.yml"
       namespace: "{{ k8s_namespace }}"
+      params_from_vars:
+        NAMESPACE: "{{ k8s_namespace}}"
+      tags:
+        - unpriv
+        - all
+    - name: Jenkins Collector
+      template: "{{ inventory_dir }}/../.openshift/templates/hygieia-jenkins-build-collector-deployment.yml"
+      namespace: "{{ k8s_namespace }}"
+      params_from_vars:
+        NAMESPACE: "{{ k8s_namespace }}"
+        OPENSHIFT_DEFAULT_SUBDOMAIN: "{{ openshift_default_subdomain }}"
       tags:
         - unpriv
         - all
@@ -75,6 +93,12 @@ openshift_cluster_content:
       tags:
         - unpriv
         - all
+    - name: API Service
+      template: "{{ inventory_dir }}/../.openshift/templates/api-service.yml"
+      namespace: "{{ k8s_namespace }}"
+      tags:
+        - unpriv
+        - all
   - object: Routes
     content:
     - name: UI Route

diff --git a/hygieia/.openshift/templates/api-service.yml b/hygieia/.openshift/templates/api-service.yml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: api-service
+objects:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: api-service
+  spec:
+    selector:
+      app: api
+    ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
diff --git a/hygieia/.openshift/templates/build-ui.yml b/hygieia/.openshift/templates/build-ui.yml
@@ -45,7 +45,7 @@ objects:
     source:
       contextDir: /UI
       git:
-        ref: s2i-support
+        ref: override-default-nginx-conf
         uri: https://github.com/tomgeorge/Hygieia
       type: Git
     strategy:
@@ -100,8 +100,13 @@ objects:
           kind: ImageStreamTag
           name: build-ui:latest
         paths:
+        paths:
         - destinationDir: .
           sourcePath: /opt/app-root/src/dist/.
+        - destinationDir: ./nginx-default-cfg
+          sourcePath: /opt/app-root/src/docker/api.conf
+        - destinationDir: ./nginx-start
+          sourcePath: /opt/app-root/src/docker/substitute-nginx-proxy-pass.sh
       type: Image
     strategy:
       sourceStrategy:

diff --git a/hygieia/.openshift/templates/deployment-ui.yml b/hygieia/.openshift/templates/deployment-ui.yml
@@ -34,7 +34,12 @@ objects:
           deploymentconfig: ui
       spec:
         containers:
-        - image: ui:latest
+        - env:
+          - name: API_PORT
+            value: "8080"
+          - name: API_HOST
+            value: api-service.${NAMESPACE}.svc
+          image: ui:latest
           imagePullPolicy: Always
           name: ui
           ports:
@@ -59,3 +64,6 @@ objects:
           name: ui:latest
       type: ImageChange
     - type: ConfigChange
+parameters:
+- name: NAMESPACE
+
diff --git a/hygieia/.openshift/templates/hygieia-jenkins-build-collector-deployment.yml b/hygieia/.openshift/templates/hygieia-jenkins-build-collector-deployment.yml
@@ -0,0 +1,84 @@
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: hygieia-jenkins-build-collector
+objects:
+- apiVersion: v1
+  kind: DeploymentConfig
+  metadata:
+    creationTimestamp: null
+    generation: 1
+    labels:
+      app: hygieia-jenkins-build-collector
+    name: hygieia-jenkins-build-collector
+  spec:
+    serviceName: jenkins
+    replicas: 1
+    selector:
+      deploymentconfig: hygieia-jenkins-build-collector
+    strategy:
+      activeDeadlineSeconds: 21600
+      resources: {}
+      rollingParams:
+        intervalSeconds: 1
+        maxSurge: 25%
+        maxUnavailable: 25%
+        timeoutSeconds: 600
+        updatePeriodSeconds: 1
+      type: Rolling
+    template:
+      metadata:
+        creationTimestamp: null
+        labels:
+          app: hygieia-jenkins-build-collector
+          deploymentconfig: hygieia-jenkins-build-collector
+      spec:
+        serviceAccountName: jenkins
+        containers:
+        - env:
+          - name: DBNAME
+            valueFrom:
+              secretKeyRef:
+                key: database-name
+                name: mongodb
+          - name: DBPASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: database-password
+                name: mongodb
+          - name: DBHOST
+            value: mongodb.${NAMESPACE}.svc
+          - name: JENKINS_CRON
+            value: '5 * * * * *'
+          - name: JENKINS_SERVERS_0
+            value: https://jenkins-${NAMESPACE}.${OPENSHIFT_DEFAULT_SUBDOMAIN}
+          - name: DBPORT
+            value: "27017"
+          - name: MONGO_PORT
+            value: "27017"
+          - name: DBUSERNAME
+            valueFrom:
+              secretKeyRef:
+                key: database-user
+                name: mongodb
+          image: capitalone/hygieia-jenkins-build-collector:latest
+          imagePullPolicy: Always
+          name: hygieia-jenkins-build-collector
+          ports:
+          - containerPort: 8080
+            protocol: TCP
+          resources: {}
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        schedulerName: default-scheduler
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+    test: false
+    triggers:
+    - type: ConfigChange
+parameters:
+- name: NAMESPACE
+- name: OPENSHIFT_DEFAULT_SUBDOMAIN