diff --git a/kubernetes/loculus/templates/keycloak-database-deployment.yaml b/kubernetes/loculus/templates/keycloak-database-deployment.yaml index a95d2076b8..7300e596a6 100644 --- a/kubernetes/loculus/templates/keycloak-database-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-database-deployment.yaml @@ -22,6 +22,12 @@ spec: containers: - name: loculus-keycloak-database image: postgres:latest + resources: + requests: + memory: "100Mi" + cpu: "100m" + limits: + memory: "100Mi" ports: - containerPort: 5432 env: diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index 60ae3c0a2e..45d18a4fe3 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -40,6 +40,12 @@ spec: - name: keycloak # TODO #1221 image: quay.io/keycloak/keycloak:23.0 + resources: + requests: + memory: "500Mi" + cpu: "20m" + limits: + memory: "3Gi" env: - name: DB_ADDR valueFrom: @@ -87,6 +93,9 @@ spec: value: "{{ include "keycloakUrl" . }}" - name: KC_FEATURES value: "declarative-user-profile" + # see https://github.com/keycloak/keycloak/blob/77b58275ca06d1cbe430c51db74479a7e1b409b5/quarkus/dist/src/main/content/bin/kc.sh#L95-L150 + - name: KC_RUN_IN_CONTAINER + value: "true" args: - "start" - "--import-realm" diff --git a/kubernetes/loculus/templates/lapis-silo-deployment.yaml b/kubernetes/loculus/templates/lapis-silo-deployment.yaml index 3dadc39bb8..860d6b8208 100644 --- a/kubernetes/loculus/templates/lapis-silo-deployment.yaml +++ b/kubernetes/loculus/templates/lapis-silo-deployment.yaml @@ -27,6 +27,12 @@ spec: containers: - name: silo image: ghcr.io/genspectrum/lapis-silo:{{ $.Values.imageTags.lapisSilo }} + resources: + requests: + memory: "100Mi" + cpu: "10m" + limits: + memory: "2Gi" ports: - containerPort: 8081 args: @@ -36,6 +42,12 @@ spec: mountPath: /data - name: lapis image: ghcr.io/genspectrum/lapis-v2:{{ $.Values.imageTags.lapis }} + resources: + requests: + memory: "100Mi" + cpu: "10m" + limits: + memory: "500Mi" ports: - containerPort: 8080 args: @@ -50,6 +62,12 @@ spec: - name: silo-preprocessing image: ghcr.io/genspectrum/lapis-silo:{{ $.Values.imageTags.lapisSilo }} imagePullPolicy: IfNotPresent + resources: + requests: + memory: "100Mi" + cpu: "10m" + limits: + memory: "1Gi" command: - sh - /silo_import_wrapper.sh diff --git a/kubernetes/loculus/templates/loculus-backend.yaml b/kubernetes/loculus/templates/loculus-backend.yaml index 7c93362c75..ce44abe813 100644 --- a/kubernetes/loculus/templates/loculus-backend.yaml +++ b/kubernetes/loculus/templates/loculus-backend.yaml @@ -26,6 +26,12 @@ spec: - name: backend image: "ghcr.io/loculus-project/backend:{{ $dockerTag }}" imagePullPolicy: Always + resources: + requests: + memory: "640Mi" + cpu: "100m" + limits: + memory: "1Gi" # Backend requires at least 635741K of memory livenessProbe: httpGet: path: "/actuator/health/liveness" diff --git a/kubernetes/loculus/templates/loculus-database-standin.yaml b/kubernetes/loculus/templates/loculus-database-standin.yaml index 09cd597348..780f74829c 100644 --- a/kubernetes/loculus/templates/loculus-database-standin.yaml +++ b/kubernetes/loculus/templates/loculus-database-standin.yaml @@ -21,6 +21,12 @@ spec: containers: - name: database image: postgres:latest + resources: + requests: + memory: "200Mi" + cpu: "100m" + limits: + memory: "2Gi" ports: - containerPort: 5432 env: diff --git a/kubernetes/loculus/templates/loculus-ingest-deployment.yaml b/kubernetes/loculus/templates/loculus-ingest-deployment.yaml index 4843cadf85..21ec157d43 100644 --- a/kubernetes/loculus/templates/loculus-ingest-deployment.yaml +++ b/kubernetes/loculus/templates/loculus-ingest-deployment.yaml @@ -26,6 +26,12 @@ spec: - name: ingest-{{ $key }} image: {{ $value.ingest.image}}:{{ $dockerTag }} imagePullPolicy: Always + resources: + requests: + memory: "500Mi" + cpu: "100m" + limits: + memory: "10Gi" env: - name: KEYCLOAK_INGEST_PASSWORD valueFrom: @@ -74,6 +80,12 @@ spec: - name: ingest-{{ $key }} image: {{ $value.ingest.image}}:{{ $dockerTag }} imagePullPolicy: Always + resources: + requests: + memory: "1Gi" + cpu: "100m" + limits: + memory: "10Gi" env: - name: KEYCLOAK_INGEST_PASSWORD valueFrom: diff --git a/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml b/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml index ef60a608c6..86c5d40da2 100644 --- a/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml +++ b/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml @@ -34,6 +34,12 @@ spec: - name: preprocessing-{{ $organism }} image: {{ $processingConfig.image}}:{{ $dockerTag }} imagePullPolicy: Always + resources: + requests: + memory: "40Mi" + cpu: "10m" + limits: + memory: "1Gi" env: - name: KEYCLOAK_PASSWORD valueFrom: diff --git a/kubernetes/loculus/templates/loculus-website.yaml b/kubernetes/loculus/templates/loculus-website.yaml index a164af664b..94b76650d0 100644 --- a/kubernetes/loculus/templates/loculus-website.yaml +++ b/kubernetes/loculus/templates/loculus-website.yaml @@ -28,11 +28,10 @@ spec: imagePullPolicy: Always resources: requests: - memory: "1300Mi" + memory: "200Mi" cpu: "100m" limits: - memory: "2000Mi" - cpu: "1000m" + memory: "1Gi" ports: - containerPort: 3000 volumeMounts: