Skip to content

svix: Adapt cache and queue type according to current setup

Antoine R. Dumont requested to merge adapt-svix into staging

This allows to explicit the queue and cache type expected in the test-staging-rke2 environment.

helm diff
[cluster-components] Comparing changes between branches production and adapt-svix...
Your branch is up to date with 'origin/production'.
[cluster-components] Generate config in production branch for cluster-components/values/admin-rke2.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/archive-production-rke2.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/archive-staging-rke2.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/gitlab-production.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/gitlab-staging.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/minikube.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/rancher.yaml...
[cluster-components] Generate config in production branch for cluster-components/values/test-staging-rke2.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/admin-rke2.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/archive-production-rke2.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/archive-staging-rke2.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/gitlab-production.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/gitlab-staging.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/minikube.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/rancher.yaml...
[cluster-components] Generate config in adapt-svix branch for cluster-components/values/test-staging-rke2.yaml...


------------- diff for cluster-components/values/admin-rke2.yaml -------------

No differences


------------- diff for cluster-components/values/archive-production-rke2.yaml -------------

No differences


------------- diff for cluster-components/values/archive-staging-rke2.yaml -------------

--- /tmp/swh-chart.cluster-components.AqMbt0IA/archive-staging-rke2.yaml.before 2024-04-02 12:30:17.237922986 +0200
+++ /tmp/swh-chart.cluster-components.AqMbt0IA/archive-staging-rke2.yaml.after  2024-04-02 12:30:17.841922005 +0200
@@ -183,20 +183,24 @@
                 secretKeyRef:
                   name: svix-server-secrets
                   key: APP_DB_PASS
             - name: SVIX_DB_USER
               valueFrom:
                 secretKeyRef:
                   name: svix-server-secrets
                   key: APP_DB_USER
             - name: WAIT_FOR
               value: "true"  # We want to wait for the default services
+            - name: SVIX_QUEUE_TYPE
+              value: redis
+            - name: SVIX_CACHE_TYPE
+              value: redis
             - name: SVIX_REDIS_DSN
               value: "redis://redis-svix.svix-server:6379"
             - name: SVIX_DB_DSN
               value: "postgresql://$(SVIX_DB_USER):$(SVIX_DB_PASS)@db1.internal.staging.swh.network"
 ---
 # Source: cluster-config/templates/svix/ingress.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: svix-server


------------- diff for cluster-components/values/gitlab-production.yaml -------------

No differences


------------- diff for cluster-components/values/gitlab-staging.yaml -------------

No differences


------------- diff for cluster-components/values/minikube.yaml -------------

No differences


------------- diff for cluster-components/values/rancher.yaml -------------

No differences


------------- diff for cluster-components/values/test-staging-rke2.yaml -------------

--- /tmp/swh-chart.cluster-components.AqMbt0IA/test-staging-rke2.yaml.before    2024-04-02 12:30:17.601922395 +0200
+++ /tmp/swh-chart.cluster-components.AqMbt0IA/test-staging-rke2.yaml.after     2024-04-02 12:30:18.205921415 +0200
@@ -272,20 +272,24 @@
                 secretKeyRef:
                   name: svix-server-secrets
                   key: APP_DB_PASS
             - name: SVIX_DB_USER
               valueFrom:
                 secretKeyRef:
                   name: svix-server-secrets
                   key: APP_DB_USER
             - name: WAIT_FOR
               value: "true"  # We want to wait for the default services
+            - name: SVIX_QUEUE_TYPE
+              value: rediscluster
+            - name: SVIX_CACHE_TYPE
+              value: rediscluster
             - name: SVIX_REDIS_DSN
               value: "redis://redis-svix-leader:6379"
             - name: SVIX_DB_DSN
               value: "postgresql://$(SVIX_DB_USER):$(SVIX_DB_PASS)@postgres"
             - name: SVIX_WHITELIST_SUBNETS
               value: "[10.42.0.0/16,10.43.0.0/16]"
 ---
 # Source: cluster-config/templates/svix/ingress.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress

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

Merge request reports