Staging instance, all changes can be removed at any time

Skip to content

swh/production: Activate mailmap to masking proxy sync job

Vincent Sellier requested to merge mailmap-sync-prod into production

Related to swh/infra/sysadm-environment#5391 (closed)

helm diff
[swh] Comparing changes between branches production and mailmap-sync-prod (per environment)...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment staging, namespace swh...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra-next-version...
[swh] Generate config in mailmap-sync-prod branch for environment staging...
[swh] Generate config in mailmap-sync-prod branch for environment staging...
[swh] Generate config in mailmap-sync-prod branch for environment staging...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment production, namespace swh...
[swh] Generate config in production branch for environment production, namespace swh-cassandra...
[swh] Generate config in production branch for environment production, namespace swh-cassandra-next-version...
[swh] Generate config in mailmap-sync-prod branch for environment production...
[swh] Generate config in mailmap-sync-prod branch for environment production...
[swh] Generate config in mailmap-sync-prod branch for environment production...


------------- diff for environment staging namespace swh -------------

No differences


------------- diff for environment staging namespace swh-cassandra -------------

No differences


------------- diff for environment staging namespace swh-cassandra-next-version -------------

No differences


------------- diff for environment production namespace swh -------------

--- /tmp/swh-chart.swh.bAemPN1n/production-swh.before	2024-09-02 13:53:31.766832599 +0200
+++ /tmp/swh-chart.swh.bAemPN1n/production-swh.after	2024-09-02 13:53:32.710834948 +0200
@@ -9743,27 +9743,27 @@
         ],
         "level": "INFO"
       },
       "version": 1
     }
 ---
 # Source: swh/templates/web/cronjob-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: web-archive-syncmailmaps-config-template
+  name: web-archive-syncmaskingmailmaps-config-template
   namespace: swh
 data:
   pg-service-conf: |
-    [syncmailmaps]
-    dbname=softwareheritage
-    host=postgresql-storage-rw.internal.softwareheritage.org
+    [syncmaskingmailmaps]
+    dbname=swh-masking
+    host=postgresql-masking-rw.internal.softwareheritage.org
     port=5432
     user=swhmailmap
 ---
 # Source: swh/templates/webhooks/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh
   name: webhooks-origin-visit-status-template
 data:
@@ -27266,24 +27266,24 @@
           - name: config-utils
             configMap:
               name: config-utils
               defaultMode: 0555
           restartPolicy: OnFailure
 ---
 # Source: swh/templates/web/cronjob.yaml
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: web-archive-syncmailmaps-cronjob
+  name: web-archive-syncmaskingmailmaps-cronjob
   namespace: swh
 spec:
-  schedule: "15 * * * *"
+  schedule: "15 *  * * *"
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template:
         spec:
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
                 nodeSelectorTerms:
                 - matchExpressions:
@@ -27469,40 +27469,40 @@
                       optional: false
               volumeMounts:
               - name: configuration
                 mountPath: /etc/swh
               - name: web-configuration-template
                 mountPath: /etc/swh/configuration-template
               - name: config-utils
                 mountPath: /entrypoints
                 readOnly: true
           containers:
-            - name: web-archive-syncmailmaps
+            - name: web-archive-syncmaskingmailmaps
               resources:
                 requests:
                   memory: 512Mi
                   cpu: 500m
               image: container-registry.softwareheritage.org/swh/infra/swh-apps/web:20240828.1
               command:
               - /opt/swh/entrypoint.sh
               args:
               - django-admin
-              - sync_mailmaps
+              - sync_masking_mailmaps
               - --perform
-              - service=syncmailmaps
+              - service=syncmaskingmailmaps
               env:
                 - name: STATSD_HOST
                   value: prometheus-statsd-exporter
                 - name: STATSD_PORT
                   value: "9125"
                 - name: STATSD_TAGS
-                  value: deployment:web-archive-syncmailmaps-cronjob
+                  value: deployment:web-archive-syncmaskingmailmaps-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:
@@ -27534,21 +27534,21 @@
               name: config-utils
               defaultMode: 0555
           - name: web-configuration-template
             configMap:
               name: web-archive-configuration-template
               items:
               - key: "config.yml.template"
                 path: "config.yml.template"
           - name: pgservice-configuration-template
             configMap:
-              name: web-archive-syncmailmaps-config-template
+              name: web-archive-syncmaskingmailmaps-config-template
               items:
               - key: "pg-service-conf"
                 path: "pg_service.conf"
           
           restartPolicy: OnFailure
 ---
 # Source: swh/templates/counters/rpc-ingress.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:


------------- diff for environment production namespace swh-cassandra -------------

No differences

Merge request reports

Loading