resultsdb / resultsdb-ci-listener: convert from deploymentconfig to deployment

This moves these two apps from deploymentconfig to deployment.

Assisted-by: calude

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

playbooks/openshift-apps/resultsdb-ci-listener.yml

@@ -81,5 +81,5 @@
 
     - role: openshift/object
       object_app: resultsdb-ci-listener
-      object_template: deploymentconfigs.yml.j2
-      object_objectname: deploymentconfigs.yml
+      object_template: deployment.yml.j2
+      object_objectname: deployment.yml

playbooks/openshift-apps/resultsdb.yml

@@ -92,8 +92,8 @@
 
     - role: openshift/object
       object_app: resultsdb
-      object_template: backend/deploymentconfigs.yml.j2
-      object_objectname: backend-deploymentconfigs.yml
+      object_template: backend/deployment.yml.j2
+      object_objectname: backend-deployment.yml
 
     - role: openshift/object
       object_app: resultsdb
@@ -123,8 +123,8 @@
 
     - role: openshift/object
       object_app: resultsdb
-      object_template: frontend/deploymentconfigs.yml.j2
-      object_objectname: frontend-deploymentconfigs.yml
+      object_template: frontend/deployment.yml.j2
+      object_objectname: frontend-deployment.yml
 
     - role: openshift/object
       object_app: resultsdb

roles/openshift-apps/resultsdb-ci-listener/templates/deployment.yml.j2

@@ -1,6 +1,6 @@
 ---
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: "resultsdb-ci-listener"
   labels:
@@ -8,9 +8,11 @@ metadata:
 spec:
   replicas: 1
   selector:
-    app: resultsdb-ci-listener
+    matchLabels:
+      app: resultsdb-ci-listener
   strategy:
-    type: Rolling
+    type: RollingUpdate
+    rollingUpdate: {}
   template:
     metadata:
       labels:
@@ -57,5 +59,3 @@ spec:
         - name: fedora-messaging-key-volume
           secret:
             secretName: resultsdb-ci-listener-fedora-messaging-key
-  triggers:
-    - type: ConfigChange

roles/openshift-apps/resultsdb/templates/backend/deployment.yml.j2

@@ -1,6 +1,6 @@
 ---
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: "resultsdb-api"
   labels:
@@ -9,15 +9,23 @@ metadata:
 spec:
   replicas: 2
   selector:
-    app: resultsdb
-    service: api
+    matchLabels:
+      app: resultsdb
+      service: api
   strategy:
-    type: Rolling
-    rollingParams:
-      pre:
-        failurePolicy: Abort
-        execNewPod:
-          containerName: api
+    type: RollingUpdate
+    rollingUpdate: {}
+  template:
+    metadata:
+      labels:
+        service: api
+        app: resultsdb
+      annotations:
+        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"resultsdb-api:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"api\")].image"}]'
+    spec:
+      initContainers:
+        - name: db-init
+          image: resultsdb-api
           command:
             - /bin/sh
             - -i
@@ -37,15 +45,13 @@ spec:
                 fi
               done
               exit 1
-          volumes:
-            - config-volume
-            - httpd-config-volume
-  template:
-    metadata:
-      labels:
-        service: api
-        app: resultsdb
-    spec:
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/resultsdb
+              readOnly: true
+            - name: httpd-config-volume
+              mountPath: /etc/httpd/conf.d
+              readOnly: true
       containers:
         - name: api
           image: resultsdb-api
@@ -135,13 +141,3 @@ spec:
         - name: fedora-messaging-key-volume
           secret:
             secretName: resultsdb-fedora-messaging-key
-  triggers:
-    - type: ConfigChange
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        containerNames:
-          - api
-        from:
-          kind: ImageStreamTag
-          name: resultsdb-api:latest

roles/openshift-apps/resultsdb/templates/frontend/deployment.yml.j2

@@ -1,6 +1,6 @@
 ---
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: "resultsdb-frontend"
   labels:
@@ -9,10 +9,12 @@ metadata:
 spec:
   replicas: 2
   selector:
-    app: resultsdb
-    service: web
+    matchLabels:
+      app: resultsdb
+      service: web
   strategy:
-    type: Rolling
+    type: RollingUpdate
+    rollingUpdate: {}
   template:
     metadata:
       labels:
@@ -68,9 +70,6 @@ spec:
               path: /results?limit=0
               port: 5002
 
-          # Limit to 384MB memory. This is probably *not* enough but it is
-          # necessary in the current environment to allow for 2 replicas and
-          # rolling updates, without hitting the (very aggressive) memory quota.
           resources:
             limits:
               memory: 384Mi
@@ -82,5 +81,3 @@ spec:
         - name: httpd-config-volume
           configMap:
             name: "resultsdb-frontend-httpd-config"
-  triggers:
-    - type: ConfigChange