Skip to content

Commit 8f592a2

Browse files
feat(confluence): make synchrony readinessProbe timeoutSeconds configurable (#1117)
Adds synchrony.readinessProbe.timeoutSeconds value (default 1) and wires it into the synchrony StatefulSet readinessProbe, matching the pattern already used for confluence.readinessProbe/livenessProbe. Co-authored-by: avgnrolfe.work <avgnrolfe.work@gmail.com>
1 parent b1fed2a commit 8f592a2

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/main/charts/confluence/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ Kubernetes: `>=1.21.x-0`
243243
| synchrony.readinessProbe.healthcheckPath | string | `"/synchrony/heartbeat"` | The healthcheck path to check against for the Synchrony container useful when configuring behind a reverse-proxy or loadbalancer https://confluence.atlassian.com/confkb/cannot-enable-collaborative-editing-on-synchrony-cluster-962962742.html |
244244
| synchrony.readinessProbe.initialDelaySeconds | int | `5` | The initial delay (in seconds) for the Synchrony container readiness probe, after which the probe will start running. |
245245
| synchrony.readinessProbe.periodSeconds | int | `1` | How often (in seconds) the Synchrony container readiness probe will run |
246+
| synchrony.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the Synchrony container readiness probe times out |
246247
| synchrony.replicaCount | int | `1` | Number of Synchrony pods |
247248
| synchrony.resources.container.requests.cpu | string | `"2"` | Initial CPU request by Synchrony pod. Because the container CPU request value is used in -XX:ActiveProcessorCount argument to Synchrony JVM only integers are allowed, e.g. 1, 2, 3 etc. If you want to have a small CPU claim, set it to 30m, 50m, etc. Any container cpu request value containing `m` character will be converted to -XX:ActiveProcessorCount=1 See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu |
248249
| synchrony.resources.container.requests.memory | string | `"2.5G"` | Initial Memory request Synchrony pod |

src/main/charts/confluence/templates/statefulset-synchrony.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ spec:
111111
path: {{ .Values.synchrony.readinessProbe.healthcheckPath }}
112112
initialDelaySeconds: {{ .Values.synchrony.readinessProbe.initialDelaySeconds }}
113113
periodSeconds: {{ .Values.synchrony.readinessProbe.periodSeconds }}
114+
timeoutSeconds: {{ .Values.synchrony.readinessProbe.timeoutSeconds }}
114115
failureThreshold: {{ .Values.synchrony.readinessProbe.failureThreshold }}
115116
{{- with .Values.synchrony.containerSecurityContext }}
116117
securityContext:

src/main/charts/confluence/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,6 +1482,10 @@ synchrony:
14821482
#
14831483
periodSeconds: 1
14841484

1485+
# -- Number of seconds after which the Synchrony container readiness probe times out
1486+
#
1487+
timeoutSeconds: 1
1488+
14851489
# -- The number of consecutive failures of the Synchrony container readiness probe
14861490
# before the pod fails readiness checks.
14871491
#

src/test/resources/expected_helm_output/confluence/output.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ data:
388388
healthcheckPath: /synchrony/heartbeat
389389
initialDelaySeconds: 5
390390
periodSeconds: 1
391+
timeoutSeconds: 1
391392
replicaCount: 1
392393
resources:
393394
container:
@@ -638,6 +639,7 @@ spec:
638639
path: /synchrony/heartbeat
639640
initialDelaySeconds: 5
640641
periodSeconds: 1
642+
timeoutSeconds: 1
641643
failureThreshold: 10
642644
resources:
643645
requests:

0 commit comments

Comments
 (0)