swh: deploy web service in staging environment

Related to swh/infra/sysadm-environment#4812

swh/templates/web/ingress.yaml

@@ -4,11 +4,13 @@ kind: Ingress
 metadata:
   namespace: {{ .Values.namespace }}
   name: swh-web-ingress
-#  annotations:
-#    nginx.ingress.kubernetes.io/rewrite-target: /
+  {{- if .Values.web.ingressAnnotations }}
+  annotations:
+    {{- toYaml .Values.web.ingressAnnotations | nindent 6 }}
+  {{- end }}
 spec:
-  {{- if .Values.ingressClassName }}
-  ingressClassName: {{ .Values.ingressClassName }}
+  {{- if .Values.web.ingressClassName }}
+  ingressClassName: {{ .Values.web.ingressClassName }}
   {{- end }}
   rules:
   - http:
@@ -27,7 +29,11 @@ spec:
             name: web
             port:
               number: 80
-    {{- if .Values.host }}
-    host: {{ .Values.host }}
-    {{- end }}
-{{ end }}
\ No newline at end of file
+    host: {{ .Values.web.host }}
+  {{- if .Values.web.tlsEnabled }}
+  tls:
+  - hosts:
+    - {{ .Values.web.host }}
+    secretName: swh-web-crt
+  {{- end }}
+{{ end }}

swh/tests/loaders_keda_autoscaling_test.yaml

@@ -25,8 +25,6 @@ tests:
           value: 0
 
   - it: Loaders keda downscale deactivated when "stopWhenNoActivity" is false
-    values:
-      - values/loaders-autoscaling.yaml
     set:
       namespace: test-namespace
       loaders:

swh/tests/web_ingess_test.yaml

@@ -7,8 +7,8 @@ tests:
     set:
       web.enabled: true
       namespace: mynamespace
-      ingressClassName: myingressClass
-      host: myhost
+      web.ingressClassName: myingressClass
+      web.host: myhost
     asserts:
         - containsDocument:
             kind: Ingress

swh/values/default.yaml

@@ -116,5 +116,18 @@ storage:
             values:
             - "true"
 
+web:
+  sentry:
+    enabled: true
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: swh/web
+            operator: In
+            values:
+            - "true"
+
 statsd_exporter:
   enabled: true

swh/values/staging-cassandra.yaml

@@ -191,4 +191,24 @@ storage:
       cls: remote
       url: http://objstorage0.internal.staging.swh.network:5003/
     filters_conf:
-    - type: readonly
\ No newline at end of file
+    - type: readonly
+
+web:
+  enabled: true
+  logLevel: INFO
+  replicas: 2
+  requestedCpu: 500m
+  requestedMemory: 500Mi
+  #autoScaling:
+  #  maxReplicaCount: 5
+  configSecretRef: swh-cassandra-webapp-config
+  host: webapp-cassandra.internal.staging.swh.network
+  ingressAnnotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production-gandi
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  tlsEnabled: true
+
+memcached:
+  enabled: true

values-swh-application-versions.yaml

@@ -24,6 +24,8 @@ swh_loader_svn_image: container-registry.softwareheritage.org/swh/infra/swh-apps
 swh_loader_svn_image_version: '20230306.1'
 swh_storage_image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage
 swh_storage_image_version: '20230327.1'
+swh_web_image: container-registry.softwareheritage.org/swh/infra/swh-apps/web
+swh_web_image_version: '20230420.1'
 swh_storage_replayer_image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage_replayer
 swh_storage_replayer_image_version: '20230321.1'
 swh_vault_cookers_image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers