diff --git a/roles/openshift-apps/languages/templates/cron.yml b/roles/openshift-apps/languages/templates/cron.yml index 54b0aa0765..2c385275f6 100644 --- a/roles/openshift-apps/languages/templates/cron.yml +++ b/roles/openshift-apps/languages/templates/cron.yml @@ -80,12 +80,18 @@ spec: for rel in $(ls -1d results/f*); do ./build_website.py -v --results $(basename ${rel}) ; done ; - cd website && hugo -D --baseURL https://languages{{ env_suffix }}.fedoraproject.org && - cp -R public /src/results/ + cd website && hugo -D -d /src/results/public --noTimes --baseURL https://languages{{ env_suffix }}.fedoraproject.org volumeMounts: - name: srpm-data readOnly: false mountPath: /src/results + resources: + limits: + cpu: '0' + memory: 8Gi + requests: + cpu: '0' + memory: 4Gi --- apiVersion: batch/v1beta1 kind: CronJob diff --git a/roles/openshift-apps/languages/templates/cron_template.yml b/roles/openshift-apps/languages/templates/cron_template.yml index a087dbaf4b..2b4856a5f7 100644 --- a/roles/openshift-apps/languages/templates/cron_template.yml +++ b/roles/openshift-apps/languages/templates/cron_template.yml @@ -45,6 +45,13 @@ initContainers: - name: srpm-data readOnly: false mountPath: /src/results + resources: + limits: + cpu: 2000m + memory: 5Gi + requests: + cpu: '0' + memory: 2Gi containers: - name: stats image: "docker-registry.default.svc:5000/languages/builder:latest" @@ -65,4 +72,11 @@ containers: - name: srpm-data readOnly: false mountPath: /src/results + resources: + limits: + cpu: 2000m + memory: 8Gi + requests: + cpu: '0' + memory: 4Gi diff --git a/roles/openshift-apps/languages/templates/deploymentconfig.yml b/roles/openshift-apps/languages/templates/deploymentconfig.yml index c69b5e0d1a..58cf420983 100644 --- a/roles/openshift-apps/languages/templates/deploymentconfig.yml +++ b/roles/openshift-apps/languages/templates/deploymentconfig.yml @@ -31,6 +31,13 @@ spec: - name: nginx-data subPath: logs mountPath: /var/log/nginx + resources: + limits: + cpu: 20m + memory: 100Mi + requests: + cpu: '0' + memory: 10Mi volumes: - name: nginx-data persistentVolumeClaim: