Skip to content

production/deposit: Switch loader & checker to use dynamic instance

As a first step towards migrating the dynamic instance as the main public one.

make swh-helm-diff
Switched to branch 'production'
Switched to branch 'migrate-deposit-loader-checker-to-dynamic-instance'
Switched to branch 'production'
Switched to branch 'migrate-deposit-loader-checker-to-dynamic-instance'
./swh/helm-diff.sh
[swh] Comparing changes between branches production and migrate-deposit-loader-checker-to-dynamic-instance (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 migrate-deposit-loader-checker-to-dynamic-instance branch for environment staging...
[swh] Generate config in migrate-deposit-loader-checker-to-dynamic-instance branch for environment staging...
[swh] Generate config in migrate-deposit-loader-checker-to-dynamic-instance 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 migrate-deposit-loader-checker-to-dynamic-instance branch for environment production...
[swh] Generate config in migrate-deposit-loader-checker-to-dynamic-instance branch for environment production...
[swh] Generate config in migrate-deposit-loader-checker-to-dynamic-instance 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.obkflgac/production-swh.before   2024-01-10 16:31:50.369457409 +0100
+++ /tmp/swh-chart.swh.obkflgac/production-swh.after    2024-01-10 16:31:50.869457436 +0100
@@ -181,21 +181,21 @@
       - cls: remote
         url: http://storage-azure-read-only-rpc-ingress
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@rabbitmq.internal.softwareheritage.org:5672/%2f
       task_acks_late: true
       task_modules:
       - swh.deposit.loader.tasks
       task_queues:
       - swh.deposit.loader.tasks.ChecksDepositTsk
     deposit:
-      url: https://deposit.softwareheritage.org/1/private/
+      url: http://deposit-dynamic.internal.softwareheritage.org/1/private/
       auth:
         username: ${DEPOSIT_USERNAME}
         password: ${DEPOSIT_PASSWORD}
   init-container-entrypoint.sh: |
     #!/bin/bash

     set -e

     CONFIG_FILE=/etc/swh/config.yml

@@ -3706,21 +3706,21 @@
       - cls: filter
       - cls: retry
       - cls: remote
         url: http://saam.internal.softwareheritage.org:5002
     default_filename:
       archive.tar
     deposit:
       auth:
         password: ${DEPOSIT_PASSWORD}
         username: ${DEPOSIT_USERNAME}
-      url: https://deposit.softwareheritage.org/1/private
+      url: http://deposit-dynamic.internal.softwareheritage.org/1/private
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@rabbitmq.internal.softwareheritage.org:5672/%2f
       task_acks_late: false
       task_queues:
       - swh.loader.package.deposit.tasks.LoadDeposit

       sentry_settings_for_celery_tasks:
         __sentry-settings-for-celery-tasks__
     metadata_fetcher_credentials:
       __metadata-fetcher-credentials__
@@ -16360,21 +16360,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: checker-deposit
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: e45e7d7595bcd552ba6deec1817ee27258d04456e67f951806a852331d97924b
+        checksum/config: 33da297b413d8b2a8ecb8cbc202767c1cec676832626deaf183126e4c03cbdfe
     spec:
       affinity:

         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/deposit
                 operator: In
                 values:
@@ -22604,21 +22604,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: loader-deposit
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: da94a663cdc1e575334e3d796b29758e5005367e351d76f9052937d7e189932c
+        checksum/config: 09a605361b0f3f0f6c224160578639fc124a5474d00785f735bd501391870c57
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/loader
                 operator: In
                 values:
                 - "true"


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

No differences

Refs. swh/infra/sysadm-environment#5191 (closed)

Merge request reports