From 8d6026a6aa0e9c627f7858ccda1ecd1cc0d597d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 10 Dec 2024 10:03:52 +0100 Subject: [PATCH] Replace toddlers with poddlers in prod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .../toddlers/templates/cron_playtime.yml | 752 +++++++++--------- .../toddlers/templates/deploymentconfig.yml | 4 - 2 files changed, 375 insertions(+), 381 deletions(-) diff --git a/roles/openshift-apps/toddlers/templates/cron_playtime.yml b/roles/openshift-apps/toddlers/templates/cron_playtime.yml index 858bb912ed..a5684d81ed 100644 --- a/roles/openshift-apps/toddlers/templates/cron_playtime.yml +++ b/roles/openshift-apps/toddlers/templates/cron_playtime.yml @@ -1,386 +1,13 @@ -{% if env != 'staging' %} ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-packager-bugzilla-sync -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 */6 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "packager_bugzilla_sync"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt - ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-check-email-overrides -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 6 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check_email_overrides"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt - ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-clean-retired-packages -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 8 1 * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "clean_retired_packages"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt - ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-packagers-without-bugzilla -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 7 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "packagers_without_bugzilla"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt - - ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-distgit-bugzilla-sync -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 */12 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "distgit_bugzilla_sync"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-pagure-fas-groups-sync -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 4 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "pagure_fas_groups_sync"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: playtime-koji-block-retired -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "30 5 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cron_playtime_toddlers" - spec: - restartPolicy: Never - containers: - - name: toddlers - image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest - command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "koji_block_retired"] - env: - - name: PYTHONPATH - value: "/code" - volumeMounts: - - name: toddlers-secret-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 - volumes: - - name: toddlers-secret-volume - secret: - secretName: toddlers-secret - - name: fedora-messaging-ca-volume - secret: - secretName: toddlers-fedora-messaging-ca - - name: fedora-messaging-key-volume - secret: - secretName: toddlers-fedora-messaging-key - - name: fedora-messaging-cert-volume - secret: - secretName: toddlers-fedora-messaging-crt - -{% else %} -## Replaced by Poddlers ## # --- # apiVersion: batch/v1 # kind: CronJob # metadata: -# name: playtime-check-commit-rights +# name: playtime-packager-bugzilla-sync # spec: # successfulJobsHistoryLimit: 3 # failedJobsHistoryLimit: 3 # concurrencyPolicy: Forbid -# schedule: "0 8 */2 * *" +# schedule: "0 */6 * * *" # startingDeadlineSeconds: 500 # jobTemplate: # spec: @@ -393,7 +20,7 @@ spec: # containers: # - name: toddlers # image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest -# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check-commit-rights"] +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "packager_bugzilla_sync"] # env: # - name: PYTHONPATH # value: "/code" @@ -423,6 +50,60 @@ spec: # - name: fedora-messaging-cert-volume # secret: # secretName: toddlers-fedora-messaging-crt +# +# --- +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: playtime-check-email-overrides +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "0 6 * * *" +# startingDeadlineSeconds: 500 +# jobTemplate: +# spec: +# template: +# metadata: +# labels: +# parent: "cron_playtime_toddlers" +# spec: +# restartPolicy: Never +# containers: +# - name: toddlers +# image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check_email_overrides"] +# env: +# - name: PYTHONPATH +# value: "/code" +# volumeMounts: +# - name: toddlers-secret-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 +# volumes: +# - name: toddlers-secret-volume +# secret: +# secretName: toddlers-secret +# - name: fedora-messaging-ca-volume +# secret: +# secretName: toddlers-fedora-messaging-ca +# - name: fedora-messaging-key-volume +# secret: +# secretName: toddlers-fedora-messaging-key +# - name: fedora-messaging-cert-volume +# secret: +# secretName: toddlers-fedora-messaging-crt +# # --- # apiVersion: batch/v1 # kind: CronJob @@ -475,4 +156,321 @@ spec: # - name: fedora-messaging-cert-volume # secret: # secretName: toddlers-fedora-messaging-crt -{% endif %} +# +# --- +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: playtime-packagers-without-bugzilla +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "0 7 * * *" +# startingDeadlineSeconds: 500 +# jobTemplate: +# spec: +# template: +# metadata: +# labels: +# parent: "cron_playtime_toddlers" +# spec: +# restartPolicy: Never +# containers: +# - name: toddlers +# image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "packagers_without_bugzilla"] +# env: +# - name: PYTHONPATH +# value: "/code" +# volumeMounts: +# - name: toddlers-secret-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 +# volumes: +# - name: toddlers-secret-volume +# secret: +# secretName: toddlers-secret +# - name: fedora-messaging-ca-volume +# secret: +# secretName: toddlers-fedora-messaging-ca +# - name: fedora-messaging-key-volume +# secret: +# secretName: toddlers-fedora-messaging-key +# - name: fedora-messaging-cert-volume +# secret: +# secretName: toddlers-fedora-messaging-crt +# +# +# --- +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: playtime-distgit-bugzilla-sync +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "0 */12 * * *" +# startingDeadlineSeconds: 500 +# jobTemplate: +# spec: +# template: +# metadata: +# labels: +# parent: "cron_playtime_toddlers" +# spec: +# restartPolicy: Never +# containers: +# - name: toddlers +# image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "distgit_bugzilla_sync"] +# env: +# - name: PYTHONPATH +# value: "/code" +# volumeMounts: +# - name: toddlers-secret-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 +# volumes: +# - name: toddlers-secret-volume +# secret: +# secretName: toddlers-secret +# - name: fedora-messaging-ca-volume +# secret: +# secretName: toddlers-fedora-messaging-ca +# - name: fedora-messaging-key-volume +# secret: +# secretName: toddlers-fedora-messaging-key +# - name: fedora-messaging-cert-volume +# secret: +# secretName: toddlers-fedora-messaging-crt +# --- +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: playtime-pagure-fas-groups-sync +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "0 4 * * *" +# startingDeadlineSeconds: 500 +# jobTemplate: +# spec: +# template: +# metadata: +# labels: +# parent: "cron_playtime_toddlers" +# spec: +# restartPolicy: Never +# containers: +# - name: toddlers +# image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "pagure_fas_groups_sync"] +# env: +# - name: PYTHONPATH +# value: "/code" +# volumeMounts: +# - name: toddlers-secret-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 +# volumes: +# - name: toddlers-secret-volume +# secret: +# secretName: toddlers-secret +# - name: fedora-messaging-ca-volume +# secret: +# secretName: toddlers-fedora-messaging-ca +# - name: fedora-messaging-key-volume +# secret: +# secretName: toddlers-fedora-messaging-key +# - name: fedora-messaging-cert-volume +# secret: +# secretName: toddlers-fedora-messaging-crt +# --- +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: playtime-koji-block-retired +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "30 5 * * *" +# startingDeadlineSeconds: 500 +# jobTemplate: +# spec: +# template: +# metadata: +# labels: +# parent: "cron_playtime_toddlers" +# spec: +# restartPolicy: Never +# containers: +# - name: toddlers +# image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "koji_block_retired"] +# env: +# - name: PYTHONPATH +# value: "/code" +# volumeMounts: +# - name: toddlers-secret-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 +# volumes: +# - name: toddlers-secret-volume +# secret: +# secretName: toddlers-secret +# - name: fedora-messaging-ca-volume +# secret: +# secretName: toddlers-fedora-messaging-ca +# - name: fedora-messaging-key-volume +# secret: +# secretName: toddlers-fedora-messaging-key +# - name: fedora-messaging-cert-volume +# secret: +# secretName: toddlers-fedora-messaging-crt +# +# {% else %} +# ## Replaced by Poddlers ## +# # --- +# # apiVersion: batch/v1 +# # kind: CronJob +# # metadata: +# # name: playtime-check-commit-rights +# # spec: +# # successfulJobsHistoryLimit: 3 +# # failedJobsHistoryLimit: 3 +# # concurrencyPolicy: Forbid +# # schedule: "0 8 */2 * *" +# # startingDeadlineSeconds: 500 +# # jobTemplate: +# # spec: +# # template: +# # metadata: +# # labels: +# # parent: "cron_playtime_toddlers" +# # spec: +# # restartPolicy: Never +# # containers: +# # - name: toddlers +# # image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# # command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check-commit-rights"] +# # env: +# # - name: PYTHONPATH +# # value: "/code" +# # volumeMounts: +# # - name: toddlers-secret-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 +# # volumes: +# # - name: toddlers-secret-volume +# # secret: +# # secretName: toddlers-secret +# # - name: fedora-messaging-ca-volume +# # secret: +# # secretName: toddlers-fedora-messaging-ca +# # - name: fedora-messaging-key-volume +# # secret: +# # secretName: toddlers-fedora-messaging-key +# # - name: fedora-messaging-cert-volume +# # secret: +# # secretName: toddlers-fedora-messaging-crt +# # --- +# # apiVersion: batch/v1 +# # kind: CronJob +# # metadata: +# # name: playtime-clean-retired-packages +# # spec: +# # successfulJobsHistoryLimit: 3 +# # failedJobsHistoryLimit: 3 +# # concurrencyPolicy: Forbid +# # schedule: "0 8 1 * *" +# # startingDeadlineSeconds: 500 +# # jobTemplate: +# # spec: +# # template: +# # metadata: +# # labels: +# # parent: "cron_playtime_toddlers" +# # spec: +# # restartPolicy: Never +# # containers: +# # - name: toddlers +# # image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest +# # command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "clean_retired_packages"] +# # env: +# # - name: PYTHONPATH +# # value: "/code" +# # volumeMounts: +# # - name: toddlers-secret-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 +# # volumes: +# # - name: toddlers-secret-volume +# # secret: +# # secretName: toddlers-secret +# # - name: fedora-messaging-ca-volume +# # secret: +# # secretName: toddlers-fedora-messaging-ca +# # - name: fedora-messaging-key-volume +# # secret: +# # secretName: toddlers-fedora-messaging-key +# # - name: fedora-messaging-cert-volume +# # secret: +# # secretName: toddlers-fedora-messaging-crt diff --git a/roles/openshift-apps/toddlers/templates/deploymentconfig.yml b/roles/openshift-apps/toddlers/templates/deploymentconfig.yml index e684964725..14f7e8aea5 100644 --- a/roles/openshift-apps/toddlers/templates/deploymentconfig.yml +++ b/roles/openshift-apps/toddlers/templates/deploymentconfig.yml @@ -7,12 +7,8 @@ metadata: service: toddlers name: toddlers spec: -{% if env != 'staging' %} - replicas: 3 -{% else %} ## Replaced by Poddlers ## replicas: 0 -{% endif %} selector: app: toddlers deploymentconfig: toddlers