Merge branch 'main' into N21-2103-update-media-activations

hpi-schul-cloud · Jan 8, 2025 · 1aef323 · 1aef323
2 parents fba09c3 + bd6ad1e
commit 1aef323
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 25 deletions.
diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml
@@ -34,14 +34,14 @@ CLIENT_CPU_LIMITS: "1000m"
 CLIENT_CPU_REQUESTS: "100m"
 CLIENT_MEMORY_LIMITS: "1Gi"
 CLIENT_MEMORY_REQUESTS: "1Gi"
-ETHERPA_CPU_LIMITS: "1000m"
-ETHERPA_CPU_REQUESTS: "100m"
-ETHERPA_MEMORY_LIMITS: "1Gi"
-ETHERPA_MEMORY_REQUESTS: "1Gi"
-ETHERPA_NGINX_CPU_LIMITS: "1000m"
-ETHERPA_NGINX_CPU_REQUESTS: "100m"
-ETHERPA_NGINX_MEMORY_LIMITS: "1Gi"
-ETHERPA_NGINX_MEMORY_REQUESTS: "1Gi"
+ETHERPAD_CPU_LIMITS: "2000m"
+ETHERPAD_CPU_REQUESTS: "100m"
+ETHERPAD_MEMORY_LIMITS: "2Gi"
+ETHERPAD_MEMORY_REQUESTS: "2Gi"
+ETHERPAD_NGINX_CPU_LIMITS: "2000m"
+ETHERPAD_NGINX_CPU_REQUESTS: "100m"
+ETHERPAD_NGINX_MEMORY_LIMITS: "1Gi"
+ETHERPAD_NGINX_MEMORY_REQUESTS: "1Gi"
 HYDRA_CPU_MAX: "1000m"
 HYDRA_CPU_MIN: "100m"
 HYDRA_MEM_MAX: "1Gi"

diff --git a/ansible/group_vars/reference/resources.yml b/ansible/group_vars/reference/resources.yml
@@ -34,14 +34,14 @@ CLIENT_CPU_LIMITS: "1000m"
 CLIENT_CPU_REQUESTS: "100m"
 CLIENT_MEMORY_LIMITS: "1Gi"
 CLIENT_MEMORY_REQUESTS: "1Gi"
-ETHERPA_CPU_LIMITS: "1000m"
-ETHERPA_CPU_REQUESTS: "100m"
-ETHERPA_MEMORY_LIMITS: "1Gi"
-ETHERPA_MEMORY_REQUESTS: "1Gi"
-ETHERPA_NGINX_CPU_LIMITS: "1000m"
-ETHERPA_NGINX_CPU_REQUESTS: "100m"
-ETHERPA_NGINX_MEMORY_LIMITS: "1Gi"
-ETHERPA_NGINX_MEMORY_REQUESTS: "1Gi"
+ETHERPAD_CPU_LIMITS: "1000m"
+ETHERPAD_CPU_REQUESTS: "100m"
+ETHERPAD_MEMORY_LIMITS: "1Gi"
+ETHERPAD_MEMORY_REQUESTS: "1Gi"
+ETHERPAD_NGINX_CPU_LIMITS: "1000m"
+ETHERPAD_NGINX_CPU_REQUESTS: "100m"
+ETHERPAD_NGINX_MEMORY_LIMITS: "1Gi"
+ETHERPAD_NGINX_MEMORY_REQUESTS: "1Gi"
 H5P_PROXY_CPU_LIMITS: "1000m"
 H5P_PROXY_CPU_REQUESTS: "100m"
 H5P_PROXY_MEMORY_LIMITS: "1Gi"

diff --git a/ansible/roles/dof_etherpad/templates/deployment.yml.j2 b/ansible/roles/dof_etherpad/templates/deployment.yml.j2
@@ -67,11 +67,24 @@ spec:
           name: apikey
         resources:
           limits:
-            cpu: {{ ETHERPA_CPU_LIMITS|default("1000m", true) }}
-            memory: {{ ETHERPA_MEMORY_LIMITS|default("1Gi", true) }}
+            cpu: {{ ETHERPAD_CPU_LIMITS|default("1000m", true) }}
+            memory: {{ ETHERPAD_MEMORY_LIMITS|default("1Gi", true) }}
           requests:
-            cpu: {{ ETHERPA_CPU_REQUESTS|default("100m", true) }}
-            memory: {{ ETHERPA_MEMORY_REQUESTS|default("128Mi", true) }}
+            cpu: {{ ETHERPAD_CPU_REQUESTS|default("100m", true) }}
+            memory: {{ ETHERPAD_MEMORY_REQUESTS|default("128Mi", true) }}
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 9001
+          initialDelaySeconds: 60
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 9001
+          initialDelaySeconds: 60
+          periodSeconds: 10
+          failureThreshold: 3
       volumes:
       - name: apikey
         secret:

diff --git a/ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2
@@ -58,11 +58,11 @@ spec:
           name: defaultconf
         resources:
           limits:
-            cpu: {{ ETHERPA_NGINX_CPU_LIMITS|default("1000m", true) }}
-            memory: {{ ETHERPA_NGINX_MEMORY_LIMITS|default("1Gi", true) }}
+            cpu: {{ ETHERPAD_NGINX_CPU_LIMITS|default("1000m", true) }}
+            memory: {{ ETHERPAD_NGINX_MEMORY_LIMITS|default("1Gi", true) }}
           requests:
-            cpu: {{ ETHERPA_NGINX_CPU_REQUESTS|default("100m", true) }}
-            memory: {{ ETHERPA_NGINX_MEMORY_REQUESTS|default("128Mi", true) }}
+            cpu: {{ ETHERPAD_NGINX_CPU_REQUESTS|default("100m", true) }}
+            memory: {{ ETHERPAD_NGINX_MEMORY_REQUESTS|default("128Mi", true) }}
         livenessProbe:
           httpGet:
             path: /

diff --git a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml
@@ -35,6 +35,6 @@ deployments_for_scaled_objects:
   - name: tldraw-server-deployment
   - name: tldraw-worker-deployment
   - name: tldraw-client-deployment
-  - name: valkey-node
+  - name: tldraw-valkey-node
     kind: StatefulSet
     replicaCount: "{{TLDRAW_VALKEY_REPLICAS}}"