[swh] Comparing changes between branches staging and mr/scheduler-tweaks (per environment)... Your branch is up to date with 'origin/staging'. [swh] Generate config in staging branch for environment staging, namespace swh... [swh] Generate config in staging branch for environment staging, namespace swh-cassandra... [swh] Generate config in staging branch for environment staging, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/scheduler-tweaks'. [swh] Generate config in mr/scheduler-tweaks branch for environment staging... [swh] Generate config in mr/scheduler-tweaks branch for environment staging... [swh] Generate config in mr/scheduler-tweaks branch for environment staging... Your branch is up to date with 'origin/staging'. [swh] Generate config in staging branch for environment production, namespace swh... [swh] Generate config in staging branch for environment production, namespace swh-cassandra... [swh] Generate config in staging branch for environment production, namespace swh-cassandra-next-version... Your branch is up to date with 'origin/mr/scheduler-tweaks'. [swh] Generate config in mr/scheduler-tweaks branch for environment production... [swh] Generate config in mr/scheduler-tweaks branch for environment production... [swh] Generate config in mr/scheduler-tweaks branch for environment production... ------------- diff for environment staging namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.r0Igz27O/staging-swh.before, 113 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.r0Igz27O/staging-swh.after, 113 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment staging namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.r0Igz27O/staging-swh-cassandra.before, 391 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.r0Igz27O/staging-swh-cassandra.after, 391 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned five differences |___/ data.config.yml.template (v1/ConfigMap/swh-cassandra/scheduler-schedule-recurrent-configuration-template) ± value change in multiline text (three inserts, no deletions) + content: + - policy: origins_without_last_update + weight: 100 + git: + - policy: origins_without_last_update + tablesample: 0.1 + weight: 85 + - policy: never_visited_oldest_update_first + tablesample: 0.1 + weight: 10 + - policy: already_visited_order_by_lag + tablesample: 0.1 + weight: 5 + git-checkout: + - policy: origins_without_last_update + weight: 100 + hg-checkout: + - policy: origins_without_last_update + weight: 100 + svn-export: + - policy: origins_without_last_update + weight: 100 + tarball-directory: + - policy: origins_without_last_update + weight: 100 spec.template.metadata.annotations.checksum/config (apps/v1/Deployment/swh-cassandra/scheduler-schedule-recurrent) ± value change - 283622daa61bf4dd09b38a1e269708df46217e1e58ba108f5ed03c6db2a0032c + 5ca22fca02500de9bb96d7bd21d33ec1591106fed2b86fd3d8bc4e381336a1b5 spec.template.spec.containers.scheduler-schedule-recurrent.args (apps/v1/Deployment/swh-cassandra/scheduler-schedule-recurrent) - two list entries removed: - "--log-level" - INFO spec.template.spec.containers.scheduler-schedule-recurrent.env.SWH_LOG_LEVEL.value (apps/v1/Deployment/swh-cassandra/scheduler-schedule-recurrent) ± value change - INFO + INFO swh.scheduler.celery_backend.recurrent_visits:DEBUG spec.jobTemplate.spec.template.spec.containers.web-cassandra-sync-mailmaps.env.STATSD_TAGS.value (batch/v1/CronJob/swh-cassandra/web-cassandra-sync-mailmaps-cronjob) ± value change - web-cassandra-sync-mailmaps-cronjob + deployment:web-cassandra-sync-mailmaps-cronjob ------------- diff for environment staging namespace swh-cassandra-next-version ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.r0Igz27O/staging-swh-cassandra-next-version.before, 149 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.r0Igz27O/staging-swh-cassandra-next-version.after, 149 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/ ------------- diff for environment production namespace swh ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.r0Igz27O/production-swh.before, 411 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.r0Igz27O/production-swh.after, 412 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned ten differences |___/ (file level) --- # Source: swh/templates/web/refresh-savecodenow-statuses-cronjob.yaml apiVersion: batch/v1 kind: CronJob metadata: │ name: web-archive-refresh-savecodenow-statuses-cronjob │ namespace: swh spec: │ schedule: "*/2 * * * *" │ concurrencyPolicy: Forbid │ jobTemplate: │ │ spec: │ │ │ template: │ │ │ │ spec: │ │ │ │ │ affinity: │ │ │ │ │ │ nodeAffinity: │ │ │ │ │ │ │ requiredDuringSchedulingIgnoredDuringExecution: │ │ │ │ │ │ │ │ nodeSelectorTerms: │ │ │ │ │ │ │ │ - matchExpressions: │ │ │ │ │ │ │ │ │ - key: swh/web │ │ │ │ │ │ │ │ │ │ operator: In │ │ │ │ │ │ │ │ │ │ values: │ │ │ │ │ │ │ │ │ │ - "true" │ │ │ │ │ priorityClassName: swh-frontend-rpc-workload │ │ │ │ │ initContainers: │ │ │ │ │ - name: prepare-web-configuration │ │ │ │ │ │ image: "container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1" │ │ │ │ │ │ imagePullPolicy: IfNotPresent │ │ │ │ │ │ command: │ │ │ │ │ │ - /entrypoints/prepare-configuration.sh │ │ │ │ │ │ volumeMounts: │ │ │ │ │ │ - name: configuration │ │ │ │ │ │ │ mountPath: /etc/swh │ │ │ │ │ │ - name: web-configuration-template │ │ │ │ │ │ │ mountPath: /etc/swh/configuration-template │ │ │ │ │ │ - name: config-utils │ │ │ │ │ │ │ mountPath: /entrypoints │ │ │ │ │ │ │ readOnly: true │ │ │ │ │ │ env: │ │ │ │ │ │ - name: SWH_SENTRY_DSN │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ │ │ key: web-sentry-dsn │ │ │ │ │ │ │ │ │ # 'name' secret should exist & include key # if the setting doesn't exist, sentry pushes will be disabled optional: true │ │ │ │ │ │ - name: DEPOSIT_PASSWORD │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: deposit-secrets │ │ │ │ │ │ │ │ │ key: password │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: DEPOSIT_USERNAME │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: deposit-secrets │ │ │ │ │ │ │ │ │ key: username │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: DJANGO_SECRET_KEY │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: swh-webapp-django-secret │ │ │ │ │ │ │ │ │ key: webapp-django-secret-key │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: DJANGO_SECRET_KEY_FALLBACK_1 │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: swh-webapp-django-secret │ │ │ │ │ │ │ │ │ key: webapp-django-secret-key-fallback-1 │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: DJANGO_SECRET_KEY_FALLBACK_2 │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: swh-webapp-django-secret │ │ │ │ │ │ │ │ │ key: webapp-django-secret-key-fallback-2 │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: GITLAB_AFN_TOKEN │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ │ │ key: gitlab_afn_token │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: GIVE_PRIVATE_TOKEN │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: web-give-secrets │ │ │ │ │ │ │ │ │ key: private-token │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: GIVE_PUBLIC_KEY │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: web-give-secrets │ │ │ │ │ │ │ │ │ key: public-key │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: INBOUND_EMAIL_SHARED_KEY │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ │ │ key: web-inbound-email-shared-key │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: PGPASSWORD │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: swh-postgresql-syncmailmap-secret │ │ │ │ │ │ │ │ │ key: postgres-syncmailmap-password │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: POSTGRESQL_PASSWORD │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: swh-postgresql-web-secrets │ │ │ │ │ │ │ │ │ key: postgres-swh-web-password │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ │ - name: WEBHOOKS_SECRET │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ │ │ key: webhooks-secret │ │ │ │ │ │ │ │ │ optional: false │ │ │ │ │ containers: │ │ │ │ │ - name: web-archive-refresh-savecodenow-statuses │ │ │ │ │ │ image: "container-registry.softwareheritage.org/swh/infra/swh-apps/web:20240604.2" │ │ │ │ │ │ imagePullPolicy: IfNotPresent │ │ │ │ │ │ command: │ │ │ │ │ │ - /opt/swh/entrypoint.sh │ │ │ │ │ │ args: │ │ │ │ │ │ - refresh │ │ │ │ │ │ resources: │ │ │ │ │ │ │ requests: │ │ │ │ │ │ │ │ memory: 512Mi │ │ │ │ │ │ │ │ cpu: 500m │ │ │ │ │ │ volumeMounts: │ │ │ │ │ │ - name: configuration │ │ │ │ │ │ │ mountPath: /etc/swh │ │ │ │ │ │ env: │ │ │ │ │ │ - name: STATSD_HOST │ │ │ │ │ │ │ value: prometheus-statsd-exporter │ │ │ │ │ │ - name: STATSD_PORT │ │ │ │ │ │ │ value: 9125 │ │ │ │ │ │ - name: STATSD_TAGS │ │ │ │ │ │ │ value: "deployment:web-archive-refresh-savecodenow-statuses-cronjob" │ │ │ │ │ │ - name: SWH_CONFIG_FILENAME │ │ │ │ │ │ │ value: /etc/swh/config.yml │ │ │ │ │ │ - name: SWH_LOG_LEVEL │ │ │ │ │ │ │ value: INFO │ │ │ │ │ │ - name: SWH_SENTRY_ENVIRONMENT │ │ │ │ │ │ │ value: production │ │ │ │ │ │ - name: SWH_MAIN_PACKAGE │ │ │ │ │ │ │ value: swh.web │ │ │ │ │ │ - name: SWH_SENTRY_DSN │ │ │ │ │ │ │ valueFrom: │ │ │ │ │ │ │ │ secretKeyRef: │ │ │ │ │ │ │ │ │ name: common-secrets │ │ │ │ │ │ │ │ │ key: web-sentry-dsn │ │ │ │ │ │ │ │ │ # if the setting doesn't exist, sentry issue pushes will be disabled optional: false │ │ │ │ │ │ - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS │ │ │ │ │ │ │ value: "true" │ │ │ │ │ volumes: │ │ │ │ │ - name: configuration │ │ │ │ │ │ emptyDir: {} │ │ │ │ │ - name: config-utils │ │ │ │ │ │ configMap: │ │ │ │ │ │ │ name: config-utils │ │ │ │ │ │ │ defaultMode: 0555 │ │ │ │ │ - name: web-configuration-template │ │ │ │ │ │ configMap: │ │ │ │ │ │ │ name: web-archive-configuration-template │ │ │ │ │ │ │ items: │ │ │ │ │ │ │ - key: config.yml.template │ │ │ │ │ │ │ │ path: config.yml.template │ │ │ │ │ restartPolicy: OnFailure data.config.yml.template (v1/ConfigMap/swh/scheduler-schedule-recurrent-configuration-template) ± value change in multiline text (three inserts, no deletions) + content: + - policy: origins_without_last_update + weight: 100 + git: + - policy: origins_without_last_update + tablesample: 0.1 + weight: 85 + - policy: never_visited_oldest_update_first + tablesample: 0.1 + weight: 10 + - policy: already_visited_order_by_lag + tablesample: 0.1 + weight: 5 + git-checkout: + - policy: origins_without_last_update + weight: 100 + hg-checkout: + - policy: origins_without_last_update + weight: 100 + svn-export: + - policy: origins_without_last_update + weight: 100 + tarball-directory: + - policy: origins_without_last_update + weight: 100 spec.replicas (apps/v1/Deployment/swh/scheduler-listener) ± value change - 2 + 4 spec.template.metadata.annotations.checksum/config (apps/v1/Deployment/swh/scheduler-schedule-recurrent) ± value change - 0c81691718398645632e3b366441673a1d7523606d4ad04f3ff3230d44b4ac9c + 85d7d1a34a00367991ab2fb2c4443d30af8d6302866d7cd63ad0432c0f4ea2ad spec.template.spec.containers.scheduler-schedule-recurrent.args (apps/v1/Deployment/swh/scheduler-schedule-recurrent) - two list entries removed: - "--log-level" - INFO spec.template.spec.containers.scheduler-schedule-recurrent.env.SWH_LOG_LEVEL.value (apps/v1/Deployment/swh/scheduler-schedule-recurrent) ± value change - INFO + INFO swh.scheduler.celery_backend.recurrent_visits:DEBUG spec.replicas (apps/v1/Deployment/swh/scheduler-rpc) ± value change - 2 + 4 spec.replicas (apps/v1/Deployment/swh/web-archive) ± value change - 4 + 6 spec.template.spec.containers.webhooks.env.SWH_LOG_LEVEL.value (apps/v1/Deployment/swh/webhooks-origin-visit-status) ± value change - INFO + INFO httpx:WARNING spec.jobTemplate.spec.template.spec.containers.web-archive-sync-mailmaps.env.STATSD_TAGS.value (batch/v1/CronJob/swh/web-archive-sync-mailmaps-cronjob) ± value change - web-archive-sync-mailmaps-cronjob + deployment:web-archive-sync-mailmaps-cronjob ------------- diff for environment production namespace swh-cassandra ------------- _ __ __ _| |_ _ / _|/ _| between /tmp/swh-chart.swh.r0Igz27O/production-swh-cassandra.before, 94 documents / _' | | | | |_| |_ and /tmp/swh-chart.swh.r0Igz27O/production-swh-cassandra.after, 94 documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned no differences |___/