Make probe thresholds and frequencies explicit

Author: benbz

charts/matrix-stack/source/common/sub_schema_values.yaml.j2

@@ -276,7 +276,8 @@ labels: {}
 {{ (credential("PostgreSQL password", "password", commented=True) | indent(2)) }}
 {%- endmacro %}
 
-{% macro probe(type, failureThreshold=none, initialDelaySeconds=none, periodSeconds=none, successThreshold=none, timeoutSeconds=none) %}
+{# The default values are the k8s defaults. We could omit but lets make them explicit. #}
+{% macro probe(type, failureThreshold=3, initialDelaySeconds=0, periodSeconds=10, successThreshold=1, timeoutSeconds=1) %}
 ## Configuration of the thresholds and frequencies of the {{ type }}Probe
 {%- if failureThreshold is none and initialDelaySeconds is none and periodSeconds is none and successThreshold is none and timeoutSeconds is none %}
 # {{ type }}Probe:

charts/matrix-stack/source/element-web.yaml.j2

@@ -30,6 +30,6 @@ replicas: 1
 {{- sub_schema_values.serviceAccount() -}}
 {{- sub_schema_values.tolerations() -}}
 {{- sub_schema_values.topologySpreadConstraints() }}
-{{- sub_schema_values.probe("liveness", failureThreshold=3, periodSeconds=10) }}
-{{- sub_schema_values.probe("readiness", failureThreshold=3, periodSeconds=3) }}
-{{- sub_schema_values.probe("startup", failureThreshold=3, initialDelaySeconds=2, periodSeconds=3) }}
+{{- sub_schema_values.probe("liveness") }}
+{{- sub_schema_values.probe("readiness", periodSeconds=3) }}
+{{- sub_schema_values.probe("startup", initialDelaySeconds=2, periodSeconds=3) }}

charts/matrix-stack/source/matrixAuthenticationService.yaml.j2

@@ -42,6 +42,6 @@ privateKeys:
 {{ sub_schema_values.workloadAnnotations() }}
 {{ sub_schema_values.serviceMonitors() }}
 {{ sub_schema_values.extraEnv() }}
-{{ sub_schema_values.probe("liveness", failureThreshold=3) }}
-{{ sub_schema_values.probe("readiness", failureThreshold=3) }}
+{{ sub_schema_values.probe("liveness") }}
+{{ sub_schema_values.probe("readiness") }}
 {{ sub_schema_values.probe("startup", initialDelaySeconds=5) }}

charts/matrix-stack/source/synapse/synapse_sub_schema_values.yaml.j2

@@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
   ## If omitted the global Synapse resources are used
   # resources: {}
 
-{{- sub_schema_values.probe("liveness", failureThreshold=3, periodSeconds=6, timeoutSeconds=2) | indent(2) }}
-{{- sub_schema_values.probe("readiness", failureThreshold=3, periodSeconds=2, successThreshold=2, timeoutSeconds=2) | indent(2) }}
+{{- sub_schema_values.probe("liveness", periodSeconds=6, timeoutSeconds=2) | indent(2) }}
+{{- sub_schema_values.probe("readiness", periodSeconds=2, successThreshold=2, timeoutSeconds=2) | indent(2) }}
 {{- sub_schema_values.probe("startup", failureThreshold=21, periodSeconds=2) | indent(2) }}
 {%- endmacro %}