Skip to content

web: Adapt configuration with status.io reference

Antoine R. Dumont requested to merge mr/update-web-configuration into swh-next-version
helm diff
[swh] Comparing changes between branches production and mr/update-web-configuration (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 mr/update-web-configuration branch for environment staging...
[swh] Generate config in mr/update-web-configuration branch for environment staging...
[swh] Generate config in mr/update-web-configuration 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 mr/update-web-configuration branch for environment production...
[swh] Generate config in mr/update-web-configuration branch for environment production...
[swh] Generate config in mr/update-web-configuration branch for environment production...


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

No differences


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

--- /tmp/swh-chart.swh.xYOj5pXb/staging-swh-cassandra.before	2025-01-20 15:39:32.540974542 +0100
+++ /tmp/swh-chart.swh.xYOj5pXb/staging-swh-cassandra.after	2025-01-20 15:39:38.100706771 +0100
@@ -8326,20 +8326,26 @@
       - ${POD_IP}
     staging_server_names:
       - webapp.staging.swh.network
       - webapp-cassandra.internal.staging.swh.network
       - web-cassandra.swh-cassandra
       - ${POD_IP}
     storage:
       cls: remote
       enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
+    status:
+      json_path: 1.0/status/578e5eddcdc0cc7951000520
+      server_url: https://status.softwareheritage.org/
+  
+    corner_ribbon_text: Staging
+    show_corner_ribbon: "true"
     search:
       cls: remote
       enable_requests_retry: true
       url: http://search-rpc-ingress
     provenance:
       cls: remote
       enable_requests_retry: true
       url: http://webapp-provenance-ingress
     scheduler:
       cls: remote
@@ -23163,21 +23169,21 @@
       app: web-cassandra
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-cassandra
       annotations:
-        checksum/config: cd6daa03251603cec6e4b1ffecba9e504804f11ab99df71389b12df08d85ac18
+        checksum/config: 27e8b988fda70be22e33035bc0430c87eec53d229b65427683263a3ee99942f7
         checksum/config-logging: 21c90a039f27f4476045b8973a841bb2b3c0e4435be7fb9ab1d748372f8a96c8
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In


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

--- /tmp/swh-chart.swh.xYOj5pXb/staging-swh-cassandra-next-version.before	2025-01-20 15:39:34.784866473 +0100
+++ /tmp/swh-chart.swh.xYOj5pXb/staging-swh-cassandra-next-version.after	2025-01-20 15:39:40.244603516 +0100
@@ -7432,20 +7432,26 @@
       - web-cassandra.swh-cassandra-next-version
       - ${POD_IP}
     staging_server_names:
       - webapp-cassandra-next-version.internal.staging.swh.network
       - web-cassandra.swh-cassandra-next-version
       - ${POD_IP}
     storage:
       cls: remote
       enable_requests_retry: true
       url: http://storage-ro-postgresql:5002
+    status:
+      json_path: 1.0/status/578e5eddcdc0cc7951000520
+      server_url: https://status.softwareheritage.org/
+  
+    corner_ribbon_text: StagingNextVersion
+    show_corner_ribbon: "true"
     search:
       cls: remote
       enable_requests_retry: true
       url: http://search-rpc:5010
     provenance:
       cls: remote
       enable_requests_retry: true
       url: http://webapp-provenance-ingress-next-version
     scheduler:
       cls: remote
@@ -20937,21 +20943,21 @@
       app: web-cassandra
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-cassandra
       annotations:
-        checksum/config: 1aa7e467e99818f14cce4d1c0e0ea7a6a1bd786a60ce654089a066c2a8bdd524
+        checksum/config: b115b94b433027379f1869a9febbaa7710c479b6812de1421bf75112d6aa9868
         checksum/config-logging: f266f784128ac9c57c6d0f154a646e15f06d0ad7557f191487df0d1b385acb48
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In


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

No differences


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

--- /tmp/swh-chart.swh.xYOj5pXb/production-swh-cassandra.before	2025-01-20 15:39:43.884428214 +0100
+++ /tmp/swh-chart.swh.xYOj5pXb/production-swh-cassandra.after	2025-01-20 15:39:47.548251756 +0100
@@ -10089,20 +10089,23 @@
       - archive.softwareheritage.org
       - base.softwareheritage.org
       - archive.internal.softwareheritage.org
       - archive-dynamic.internal.softwareheritage.org
       - web-archive.swh-cassandra
       - ${POD_IP}
     storage:
       cls: remote
       enable_requests_retry: true
       url: http://storage-azure-read-only-rpc-ingress-swh-cassandra
+    status:
+      json_path: 1.0/status/578e5eddcdc0cc7951000520
+      server_url: https://status.softwareheritage.org/
     search:
       cls: remote
       enable_requests_retry: true
       url: http://search-rpc-ingress-swh-cassandra
     provenance:
       cls: remote
       enable_requests_retry: true
       url: http://webapp-provenance-ingress-swh-cassandra
     scheduler:
       cls: remote
@@ -10244,20 +10247,22 @@
       public_key: ${GIVE_PUBLIC_KEY}
       token: ${GIVE_PRIVATE_TOKEN}
     inbound_email:
       shared_key: ${INBOUND_EMAIL_SHARED_KEY}
     matomo:
       site_id: 59
       url: https://piwik.inria.fr/
     save_code_now_webhook_secret: ${WEBHOOKS_SECRET}
     search_config:
       metadata_backend: swh-search
+    unauthenticated_api_hosts:
+    - archive.internal.softwareheritage.org
 ---
 # Source: swh/templates/web/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: web-archive-configuration-logging
 data:
   logging-gunicorn.json: |
     {
@@ -27941,21 +27946,21 @@
       app: web-archive
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-archive
       annotations:
-        checksum/config: 492d9b1847a07eb3673a65376f3179a4764e8ebcd1d51bd808c727b7b4d37918
+        checksum/config: fc51f15e3c3b3b555963bfeee34c434cc39b0c7c38a146834c2e819333d62615
         checksum/config-logging: af7bf52757798a2fcd4c237ed3de9df87c15b7f38419128a8d67d02b8a485097
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In

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

Merge request reports

Loading