From 955406b7a454a60073c2f2b103edfd8cead5f237 Mon Sep 17 00:00:00 2001 From: Phillip Date: Tue, 7 Jan 2025 15:58:27 +0100 Subject: [PATCH 1/2] BC-8627 valkey rename from valkey to tldraw-valkey (#1077) --- .../roles/namespace-activator-scaled-objects/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml index 9e7efb9cd..ccbd8a55c 100644 --- 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}}" From bd6ad1ecc9eaa140e5e24126d0c02e3e899aebf6 Mon Sep 17 00:00:00 2001 From: Phillip Date: Tue, 7 Jan 2025 16:08:37 +0100 Subject: [PATCH 2/2] BC-8637 add etherpad probes (#1078) --- ansible/group_vars/production/resources.yml | 16 +++++++------- ansible/group_vars/reference/resources.yml | 16 +++++++------- .../dof_etherpad/templates/deployment.yml.j2 | 21 +++++++++++++++---- .../templates/nginx-deployment.yml.j2 | 8 +++---- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml index 3dbfe37d6..daa69907f 100644 --- 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 index 401eaa8b8..2b0dd7496 100644 --- 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 index c8fbb0974..1961e8d82 100644 --- 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 index b913096c9..d23c2d24a 100644 --- 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: /