Skip to content

web: Extend production server list in production

Antoine R. Dumont requested to merge web-extend-server-list into production

So some views (for one the coverage widget) are better cached in different instances (e.g. webapp1.internal.s.o).

After the release of v0.3.2 [1]

[1] !276 (merged)

make swh-helm-diff
[swh] Comparing changes between branches production and web-extend-server-list (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 web-extend-server-list branch for environment staging...
[swh] Generate config in web-extend-server-list branch for environment staging...
[swh] Generate config in web-extend-server-list 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 web-extend-server-list branch for environment production...
[swh] Generate config in web-extend-server-list branch for environment production...
[swh] Generate config in web-extend-server-list 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.bODVXo81/production-swh.before   2023-12-19 14:43:56.597026864 +0100
+++ /tmp/swh-chart.swh.bODVXo81/production-swh.after    2023-12-19 14:43:57.033026887 +0100
@@ -6093,20 +6093,25 @@
   namespace: swh
   name: web-configuration-template
 data:
   config.yml.template: |
     instance_name: webapp1.internal.softwareheritage.org
     allowed_hosts:
       - webapp1.internal.softwareheritage.org
       - archive.softwareheritage.org
       - base.softwareheritage.org
       - archive.internal.softwareheritage.org
+    production_server_names:
+      - webapp1.internal.softwareheritage.org
+      - archive.softwareheritage.org
+      - base.softwareheritage.org
+      - archive.internal.softwareheritage.org
     storage:
       cls: remote
       url: http://storage-azure-read-only-rpc-ingress
     search:
       cls: remote
       url: http://search-rpc-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.softwareheritage.org
     vault:
@@ -28638,21 +28643,21 @@
       app: web
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web
       annotations:
-        checksum/config: d8a17319c4310b8e76fad47fa67457ab572eefaf0f100e9e99dfb38ac4093475
+        checksum/config: d4cf1f97c6c8a8c0d6c9089922dde9bbc2b41ca4deb3c8b78f3dfd9fdb06dc8a
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In
                 values:
                 - "true"


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

--- /tmp/swh-chart.swh.bODVXo81/production-swh-cassandra.before 2023-12-19 14:43:56.765026873 +0100
+++ /tmp/swh-chart.swh.bODVXo81/production-swh-cassandra.after  2023-12-19 14:43:57.209026897 +0100
@@ -1414,20 +1414,22 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: web-configuration-template
 data:
   config.yml.template: |
     instance_name: webapp-cassandra.internal.softwareheritage.org
     allowed_hosts:
       - webapp-cassandra.internal.softwareheritage.org
+    production_server_names:
+      - webapp-cassandra.internal.softwareheritage.org
     storage:
       cls: remote
       url: http://storage-cassandra:5002
     search:
       cls: remote
       url: http://search-rpc-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.softwareheritage.org
     vault:
@@ -14239,21 +14241,21 @@
       app: web
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web
       annotations:
-        checksum/config: ffcb5d3378471db8cd6a6e1c6c9393edabaa014d32861e1cacb75f6db193e3f1
+        checksum/config: d2ed09bc34e02ac042227c2b6e99274ce60ddf21fc56f97625fc7c9bc89e6618
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In
                 values:
                 - "true"p

Refs. swh/devel/swh-web!1215 (merged)

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

Edited by Antoine R. Dumont

Merge request reports