swh/templates/graphql/deployment.yaml

@@ -37,8 +37,8 @@ spec:
       affinity:
         {{- toYaml $.Values.graphql.affinity | nindent 8 }}
       {{- end }}
-      {{- if and $.Values.podPriority.enabled $.Values.graphql.priorityClassName }}
-      priorityClassName: {{ $.Values.namespace }}-{{ $.Values.graphql.priorityClassName }}
+      {{- if and $.Values.podPriority.enabled (or $.Values.graphql.priorityClassName $graphql_config.priorityClassName) }}
+      priorityClassName: {{ $.Values.namespace }}-{{ $graphql_config.priorityClassName | default $.Values.graphql.priorityClassName }}
       {{ end }}
       containers:
         - name: {{ $serviceType }}

swh/values/production/swh.yaml

@@ -203,6 +203,37 @@ graphql:
         client: swh-web
         cacheUrl: memcached://memcached:11211
       maxRawContentSize: 10000
+    webapp1:
+      replicas: 1
+      priorityClassName: low-workload
+      storageConfigurationRef: remoteROStorageConfiguration
+      searchConfigurationRef: remoteSearchConfiguration
+      introspection: yes
+      hosts:
+        - webapp1.internal.softwareheritage.org
+      ingress:
+        enabled: true
+        extraAnnotations:
+          nginx.ingress.kubernetes.io/rewrite-target: /
+        whitelistSourceRangeRef: internalNetworkRanges
+        endpoints:
+          default:
+            paths:
+              - path: /graphql/
+            extraWhitelistSourceRange:
+              # vpn network
+              - 192.168.101.0/24
+      gunicorn:
+        threads: 4
+        workers: 2
+        timeout: 3600
+      auth:
+        enabled: true
+        server: https://auth.softwareheritage.org/auth/
+        realm: SoftwareHeritage
+        client: swh-web
+        cacheUrl: memcached://memcached:11211
+      maxRawContentSize: 10000
 
 listers:
   enabled: true
@@ -1011,7 +1042,7 @@ web:
   enabled: true
   logLevel: INFO
   requestedCpu: 500m
-  requestedMemory: 500Mi
+  requestedMemory: 1024Mi
   refreshSavecodenowStatus:
     enabled: true
     concurrencyPolicy: Forbid
@@ -1019,10 +1050,11 @@ web:
     enabled: true
     concurrencyPolicy: Forbid
     configurationRef: postgresqlSyncmailmapsConfiguration
-  autoScaling:
-    minReplicaCount: 2
-    maxReplicaCount: 4
-    cpuPercentageUsage: 100
+  replicas: 2
+  # autoScaling:
+  #   minReplicaCount: 2
+  #   maxReplicaCount: 4
+  #   cpuPercentageUsage: 100
   hosts:
     - webapp1.internal.softwareheritage.org
     - archive.softwareheritage.org