From 57a51e95b41125a3e3aa86c26f66cef48ce5d27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Mon, 24 Jun 2019 14:10:15 +0200 Subject: [PATCH] release-monitoring: Change cron job to service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Konečný --- .../release-monitoring/files/cron.yml | 56 ------------ .../files/deploymentconfig.yml | 90 +++++++++++++++++++ .../templates/buildconfig.yml | 1 + 3 files changed, 91 insertions(+), 56 deletions(-) delete mode 100644 roles/openshift-apps/release-monitoring/files/cron.yml diff --git a/roles/openshift-apps/release-monitoring/files/cron.yml b/roles/openshift-apps/release-monitoring/files/cron.yml deleted file mode 100644 index f6813f4f59..0000000000 --- a/roles/openshift-apps/release-monitoring/files/cron.yml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: batch/v1beta1 -kind: CronJob -metadata: - name: anitya -spec: - concurrencyPolicy: Forbid - schedule: "0 * * * *" - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cronjobanitya" - spec: - containers: - - name: release-monitoring-web - image: docker-registry.default.svc:5000/release-monitoring/release-monitoring-web:latest - command: ["bash", "-c", "/usr/local/bin/anitya_cron.py"] - env: - - name: ANITYA_WEB_CONFIG - value: /etc/anitya/anitya.toml - volumeMounts: - - mountPath: /etc/anitya - name: config-volume - readOnly: true - - name: fedora-messaging-config-volume - mountPath: /etc/fedora-messaging - readOnly: true - - name: fedora-messaging-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: fedora-messaging-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - - name: fedora-messaging-cert-volume - mountPath: /etc/pki/rabbitmq/cert - readOnly: true - restartPolicy: Never - volumes: - - name: config-volume - configMap: - defaultMode: 420 - name: release-monitoring-configmap - - name: fedora-messaging-config-volume - configMap: - name: fedora-messaging-configmap - - name: fedora-messaging-ca-volume - secret: - secretName: release-monitoring-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: release-monitoring-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: release-monitoring-fedora-messaging-cert - diff --git a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml index 5118f58e88..d7ca8fc4cb 100644 --- a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml @@ -99,5 +99,95 @@ items: namespace: release-monitoring type: ImageChange - type: ConfigChange +- apiVersion: v1 + kind: DeploymentConfig + metadata: + labels: + app: release-monitoring-check-service + service: web + name: release-monitoring-check-servce + spec: + replicas: 1 + selector: + deploymentconfig: release-monitoring-check-service + strategy: + activeDeadlineSeconds: 21600 + recreateParams: + timeoutSeconds: 600 + resources: {} + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + app: release-monitoring-check-service + deploymentconfig: release-monitoring-check-service + spec: + containers: + - name: release-monitoring-web + image: release-monitoring/release-monitoring-web:latest + command: + - python3 + args: + - /usr/local/bin/check_service.py + env: + - name: ANITYA_WEB_CONFIG + value: /etc/anitya/anitya.toml + resources: {} + volumeMounts: + - name: config-volume + mountPath: /etc/anitya + readOnly: true + - name: fedora-messaging-config-volume + mountPath: /etc/fedora-messaging + readOnly: true + - name: fedora-messaging-ca-volume + mountPath: /etc/pki/rabbitmq/ca + readOnly: true + - name: fedora-messaging-key-volume + mountPath: /etc/pki/rabbitmq/key + readOnly: true + - name: fedora-messaging-cert-volume + mountPath: /etc/pki/rabbitmq/cert + readOnly: true + readinessProbe: + timeoutSeconds: 1 + initialDelaySeconds: 5 + httpGet: + path: / + port: 8080 + livenessProbe: + timeoutSeconds: 1 + initialDelaySeconds: 30 + httpGet: + path: / + port: 8080 + volumes: + - name: config-volume + configMap: + name: release-monitoring-configmap + - name: fedora-messaging-config-volume + configMap: + name: fedora-messaging-configmap + - name: fedora-messaging-ca-volume + secret: + secretName: release-monitoring-fedora-messaging-ca + - name: fedora-messaging-key-volume + secret: + secretName: release-monitoring-fedora-messaging-key + - name: fedora-messaging-cert-volume + secret: + secretName: release-monitoring-fedora-messaging-cert + triggers: + - imageChangeParams: + automatic: true + containerNames: + - release-monitoring-web + from: + kind: ImageStreamTag + name: release-monitoring-web:latest + namespace: release-monitoring + type: ImageChange + - type: ConfigChange kind: List metadata: {} diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index ace7f86494..0fb40014ff 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -40,6 +40,7 @@ items: python3-sqlalchemy \ python3-pytoml \ python3-wtforms \ + python3-ordered-set \ python3-mod_wsgi && \ dnf autoremove -y && \ dnf clean all -y