diff --git a/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 index 4e439f060a..d19b30d007 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 @@ -10,6 +10,7 @@ spec: concurrencyPolicy: Forbid schedule: "4 */2 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -38,6 +39,7 @@ spec: concurrencyPolicy: Forbid schedule: "55 0 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: diff --git a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 index ba0ed984f0..d607b3dda8 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 @@ -15,6 +15,7 @@ spec: concurrencyPolicy: Forbid schedule: "{{ cronjob.schedule }}" startingDeadlineSeconds: 500 + suspend: {{ (env == "staging")|ternary("true", "false") }} jobTemplate: spec: template: @@ -60,6 +61,7 @@ spec: concurrencyPolicy: Forbid schedule: "56 23 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -88,40 +90,3 @@ spec: persistentVolumeClaim: claimName: logs {{ security_context() | indent(4) }} ---- -# -### Download GeoIP database -# -apiVersion: batch/v1 -kind: CronJob -metadata: - name: download-geoip-db -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "48 * * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - spec: - restartPolicy: Never - containers: - - name: mirrormanager - image: image-registry.openshift-image-registry.svc:5000/mirrormanager/mirrormanager2:latest - command: - - "curl" - - "--create-dirs" - - "--output-dir" - - "/var/lib/mirrormanager/geoip" - - "-O" - - "https://infrastructure.fedoraproject.org/infra/bigfiles/geoip/GeoLite2-City.mmdb" - volumeMounts: - - name: var-lib - mountPath: "/var/lib/mirrormanager" - volumes: - - name: var-lib - persistentVolumeClaim: - claimName: data - {{ security_context() | indent(4) }} diff --git a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 index 797949de69..3d3bf13757 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 @@ -11,6 +11,7 @@ spec: concurrencyPolicy: Forbid schedule: "48 * * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -47,6 +48,7 @@ spec: concurrencyPolicy: Forbid schedule: "50 20 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: diff --git a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 index 9b305f3b50..098b911f18 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 @@ -10,6 +10,7 @@ spec: concurrencyPolicy: Forbid schedule: "0,15,30,45 * * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -38,6 +39,7 @@ spec: concurrencyPolicy: Forbid schedule: "30 0 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -54,37 +56,39 @@ spec: volumes: {{ common_volumes() | indent(4) }} {{ security_context() | indent(4) }} ---- -# Run the script for Internet2 netblocks very late to -# make sure the files are all there. The script is -# looking in date dependent directories and depending -# on the timezone of the remote server the files appear late. -apiVersion: batch/v1 -kind: CronJob -metadata: - name: netblocks-internet2 -spec: - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - concurrencyPolicy: Forbid - schedule: "0 23 * * *" - startingDeadlineSeconds: 500 - jobTemplate: - spec: - template: - spec: - restartPolicy: Never - containers: - - name: mirrormanager - image: image-registry.openshift-image-registry.svc:5000/mirrormanager/mirrormanager2:latest - command: ["mm2_get-netblocks", "--debug", "internet2", "/var/cache/mirrorlist/i2_netblocks.txt"] - env: - {{ common_env() | indent(4) }} - volumeMounts: - {{ common_volume_mounts() | indent(4) }} - volumes: - {{ common_volumes() | indent(4) }} - {{ security_context() | indent(4) }} +# --- +# ===== DISABLED because the source is not published anymore ===== +# # Run the script for Internet2 netblocks very late to +# # make sure the files are all there. The script is +# # looking in date dependent directories and depending +# # on the timezone of the remote server the files appear late. +# apiVersion: batch/v1 +# kind: CronJob +# metadata: +# name: netblocks-internet2 +# spec: +# successfulJobsHistoryLimit: 3 +# failedJobsHistoryLimit: 3 +# concurrencyPolicy: Forbid +# schedule: "0 23 * * *" +# startingDeadlineSeconds: 500 +# suspend: false +# jobTemplate: +# spec: +# template: +# spec: +# restartPolicy: Never +# containers: +# - name: mirrormanager +# image: image-registry.openshift-image-registry.svc:5000/mirrormanager/mirrormanager2:latest +# command: ["mm2_get-netblocks", "--debug", "internet2", "/var/cache/mirrorlist/i2_netblocks.txt"] +# env: +# {{ common_env() | indent(4) }} +# volumeMounts: +# {{ common_volume_mounts() | indent(4) }} +# volumes: +# {{ common_volumes() | indent(4) }} +# {{ security_context() | indent(4) }} --- # Amazon EC2 netblocks apiVersion: batch/v1 @@ -97,6 +101,7 @@ spec: concurrencyPolicy: Forbid schedule: "30 1 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: diff --git a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 index 8451183381..4f585c20d5 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 @@ -14,6 +14,7 @@ spec: concurrencyPolicy: Forbid schedule: "{{ cronjob.schedule }}" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: diff --git a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 index a179fc1218..f6e50e560e 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 +++ b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 @@ -13,6 +13,7 @@ spec: concurrencyPolicy: Forbid schedule: "27 */4 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -45,6 +46,7 @@ spec: concurrencyPolicy: Forbid schedule: "44 */4 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: @@ -79,6 +81,7 @@ spec: concurrencyPolicy: Forbid schedule: "10 2,18 * * *" startingDeadlineSeconds: 500 + suspend: false jobTemplate: spec: template: