Blockerbugs - deploymentconfig -> deployment, mk1

playbooks/openshift-apps/blockerbugs.yml

@@ -97,6 +97,11 @@
     object_template: deploymentconfig.yml
     object_objectname: deploymentconfig.yml
 
+  - role: openshift/object
+    object_app: blockerbugs
+    object_template: deployment.yml
+    object_objectname: deployment.yml
+
   - role: openshift/object
     object_app: blockerbugs
     object_template: imagestream.yml

roles/openshift-apps/blockerbugs/files/service.yml

@@ -13,7 +13,7 @@ spec:
     targetPort: 8080
   selector:
     app: blockerbugs
-    deploymentconfig: blockerbugs
+    service: blockerbugsN
 ---
 apiVersion: v1
 kind: Service
@@ -29,4 +29,4 @@ spec:
     targetPort: 8080
   selector:
     app: blockerbugs
-    deploymentconfig: qa-landing
+    service: qa-landingN

roles/openshift-apps/blockerbugs/templates/deployment.yml

@@ -0,0 +1,152 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: blockerbugs
+    service: blockerbugsN
+  name: blockerbugs
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"blockerbugs:latest","namespace":"blockerbugs"},"fieldPath":"spec.template.spec.containers[?(@.name==\"blockerbugs\")].image","pause":"false"}]
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: blockerbugs
+      service: blockerbugsN
+  template:
+    metadata:
+      labels:
+        app: blockerbugs
+        service: blockerbugsN
+    spec:
+      containers:
+      - name: blockerbugs
+        image: image-registry.openshift-image-registry.svc:5000/blockerbugs/blockerbugs:latest
+        ports:
+        - containerPort: 8080
+        resources: {}
+        env:
+{% if env == 'staging' %}
+        - name: POSTGRESQL_USER
+          value: "{{ stg_blockerbugs_db_user }}"
+{% else %}
+        - name: POSTGRESQL_USER
+          value: "{{ prod_blockerbugs_db_user }}"
+{% endif %}
+        - name: POSTGRESQL_DATABASE
+          value: "blockerbugs"
+        - name: POSTGRESQL_SERVICE_HOST
+          value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
+        - name: POSTGRESQL_SERVICE_PORT
+          value: "5432"
+{% if env == 'staging' %}
+        - name: POSTGRESQL_PASSWORD
+          value: "{{ stg_blockerbugs_db_password }}"
+        - name: SECRET_KEY
+          value: "{{ stg_blockerbugs_secret_key }}"
+        - name: PAGURE_REPO_TOKEN
+          value: "{{ stg_blockerbugs_pagure_repo_token_secret }}"
+        - name: PAGURE_REPO_WEBHOOK_KEY
+          value: "{{ stg_blockerbugs_pagure_repo_webhook_key_secret }}"
+        - name: BUGZILLA_API_KEY
+          value: "{{ stg_blockerbugs_bz_api_key }}"
+        - name: PAGURE_URL
+          value: "https://stg.pagure.io/"
+        - name: PAGURE_API
+          value: "https://stg.pagure.io/api/0/"
+        - name: BUGZILLA_URL
+          value: "https://bugzilla.stage.redhat.com"
+{% else %}
+        - name: POSTGRESQL_PASSWORD
+          value: "{{ prod_blockerbugs_db_password }}"
+        - name: SECRET_KEY
+          value: "{{ prod_blockerbugs_secret_key }}"
+        - name: PAGURE_REPO_TOKEN
+          value: "{{ prod_blockerbugs_pagure_repo_token_secret }}"
+        - name: PAGURE_REPO_WEBHOOK_KEY
+          value: "{{ prod_blockerbugs_pagure_repo_webhook_key_secret }}"
+        - name: BUGZILLA_API_KEY
+          value: "{{ prod_blockerbugs_bz_api_key }}"
+        - name: PAGURE_URL
+          value: "https://pagure.io/"
+        - name: PAGURE_API
+          value: "https://pagure.io/api/0/"
+        - name: BUGZILLA_URL
+          value: "https://bugzilla.redhat.com"
+{% endif %}
+        - name: BLOCKERBUGS_URL
+          value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/"
+        - name: BLOCKERBUGS_API
+          value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/api/v0/"
+        - name: FAS_BASE_URL
+          value: "https://admin{{ env_suffix }}.fedoraproject.org/accounts/"
+        - name: FAS_ADMIN_GROUP
+          value: "qa-admin"
+        - name: PAGURE_BOT_USERNAME
+          value: "blockerbot"
+        - name: PAGURE_BOT_ENABLED
+          value: "True"
+        - name: PAGURE_REPO
+          value: "fedora-qa/blocker-review"
+        - name: BODHI_URL
+          value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
+        - name: OPENSHIFT_PROD
+{% if env == 'staging' %}
+          value: "0"
+{% else %}
+          value: "1"
+{% endif %}
+        volumeMounts:
+        - name: blockerbugs-secret-volume
+          mountPath: /opt/app-root/secret/
+          readOnly: true
+        readinessProbe:
+          timeoutSeconds: 5
+          initialDelaySeconds: 5
+          httpGet:
+            path: /blockerbugs/
+            port: 8080
+        livenessProbe:
+          timeoutSeconds: 15
+          initialDelaySeconds: 30
+          httpGet:
+            path: /blockerbugs/
+            port: 8080
+      volumes:
+      - name: blockerbugs-secret-volume
+        secret:
+          secretName: blockerbugs-secret
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: blockerbugs
+    service: qa-landingN
+  name: qa-landing
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"qa-landing:latest","namespace":"blockerbugs"},"fieldPath":"spec.template.spec.containers[?(@.name==\"qa-landing\")].image","pause":"false"}]
+spec:
+  replicas: 1 # Never change this to more or less than ONE!
+  selector:
+    matchLabels:
+      app: blockerbugs
+      service: qa-landingN
+  template:
+    metadata:
+      labels:
+        app: blockerbugs
+        service: qa-landingN
+    spec:
+      containers:
+      - name: qa-landing
+        image: image-registry.openshift-image-registry.svc:5000/blockerbugs/qa-landing:latest
+        resources: {}
+        env:
+        - name: SUBDIR
+          value: "/"
+        - name: API
+          value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/"

roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml

@@ -7,7 +7,7 @@ metadata:
     service: blockerbugs
   name: blockerbugs
 spec:
-  replicas: 1
+  replicas: 0
   selector:
     app: blockerbugs
     deploymentconfig: blockerbugs
@@ -147,7 +147,7 @@ metadata:
     service: qa-landing
   name: qa-landing
 spec:
-  replicas: 1 # Never change this to more or less than ONE!
+  replicas: 0 # Never change this to more or less than ONE!
   selector:
     app: blockerbugs
     deploymentconfig: blockerbugs