cluster-components/templates/svix/network-policies.yaml

@@ -37,7 +37,11 @@ metadata:
 spec:
   podSelector:
     matchLabels:
+{{- if .Values.svix.redis.enabled }}
       app: svix-redis
+{{- else }}
+      app: redis-svix
+{{- end }}
   ingress:
     - from:
         - podSelector:
@@ -46,6 +50,8 @@ spec:
       ports:
         - protocol: TCP
           port: 6379
+{{- end }}
+{{ if .Values.svix.postgres.enabled -}}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

cluster-components/templates/svix/postgres.yaml

-{{ if .Values.svix.enabled -}}
+{{ if and .Values.svix.enabled .Values.svix.postgres.enabled -}}
 {{ with .Values.svix -}}
 ---
 apiVersion: apps/v1

cluster-components/templates/svix/redis.yaml

-{{ if .Values.svix.enabled -}}
+{{ if and .Values.svix.enabled .Values.svix.redis.enabled -}}
 {{ with .Values.svix -}}
 ---
 apiVersion: apps/v1

cluster-components/templates/svix/services.yaml

 {{ if .Values.svix.enabled -}}
+{{ if .Values.svix.postgres.enabled -}}
 {{- with .Values.svix }}
 ---
 apiVersion: v1
@@ -14,6 +15,10 @@ spec:
     - port: 5432
       targetPort: 5432
       name: postgres
+{{- end }}
+{{- end }}
+{{ if .Values.svix.redis.enabled -}}
+{{- with .Values.svix }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,6 +33,9 @@ spec:
     - port: 6379
       targetPort: 6379
       name: redis
+{{- end }}
+{{- end }}
+{{- with .Values.svix }}
 ---
 apiVersion: v1
 kind: Service

cluster-components/templates/svix/svix-server.yaml

 {{ if .Values.svix.enabled -}}
 {{ with .Values.svix -}}
+{{ $redisDsn := .redisDsn | default "redis" -}}
+{{ $postgresDsn := .postgresDsn | default "postgres" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -72,8 +74,8 @@ spec:
             - name: WAIT_FOR
               value: "true"  # We want to wait for the default services
             - name: SVIX_REDIS_DSN
-              value: "redis://redis:6379"
+              value: "redis://{{ $redisDsn }}:6379"
             - name: SVIX_DB_DSN
-              value: "postgresql://$(SVIX_DB_USER):$(SVIX_DB_PASS)@postgres"
+              value: "postgresql://$(SVIX_DB_USER):$(SVIX_DB_PASS)@{{ $postgresDsn }}"
 {{- end }}
 {{- end }}

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

@@ -4,3 +4,23 @@ alertmanager:
 
 podPriority:
   enabled: true
+
+svix:
+  enabled: true
+  ingress:
+    host: svix.internal.staging.swh.network
+    createTLS: true
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-production-gandi
+      kubernetes.io/tls-acme: "true"
+      nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    whitelistSourceRange:
+      # webapp.internal.staging.swh.network
+      - 192.168.130.30
+      # admin ip
+      - 192.168.50.0/24
+  requestedMemory: 100Mi
+  requestedCpu: 100m
+  namespace: svix-server
+  redisDsn: redis-svix.svix-server
+  postgresDsn: db1.internal.staging.swh.network

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

@@ -22,10 +22,12 @@ svix:
   requestedCpu: 100m
   namespace: svix-server
   postgres:
+    enabled: true
     requestedMemory: 100Mi
     requestedCpu: 100m
     persistentVolume: false
   redis:
+    enabled: true
     requestedMemory: 100Mi
     requestedCpu: 100m
     persistentVolume: false

swh/Chart.yaml

 apiVersion: v2
-appVersion: 137
+appVersion: 138
 description: A Helm chart to deploy the softwareheritage stack
 name: swh
 type: application

swh/values/production/swh-cassandra.yaml

@@ -276,8 +276,8 @@ web:
           - path: /static
             port: 80
         extraWhitelistSourceRange:
-          # vpn network
-          - 192.168.101.0/24
+          - 192.168.50.0/24 # for blackbox monitoring
+          - 192.168.101.0/24 # vpn network
 
   databaseConfigurationRef: postgresqlWebConfiguration
   searchConfigurationRef: remoteSearchConfiguration

values-swh-application-versions.yaml

@@ -3,7 +3,7 @@ software_stories_image_version: '20230912.1'
 swh_deposit_checkers_image: container-registry.softwareheritage.org/swh/infra/swh-apps/deposit_checkers
 swh_deposit_checkers_image_version: '20231018.1'
 swh_graphql_image: container-registry.softwareheritage.org/swh/infra/swh-apps/graphql
-swh_graphql_image_version: '20231025.1'
+swh_graphql_image_version: '20231102.1'
 swh_indexer_image: container-registry.softwareheritage.org/swh/infra/swh-apps/indexer
 swh_indexer_image_version: '20231006.1'
 swh_indexer_storage_image: container-registry.softwareheritage.org/swh/infra/swh-apps/indexer_storage