From fb28eea449bcdafeddad1a12ea88e1f5121b01b0 Mon Sep 17 00:00:00 2001 From: Bruno Brito <39683855+brunobritorj@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:22:17 +0200 Subject: [PATCH] Support to nodes livenessProbe into the Helm Chart (#1897) In the Helm Chart, there was no ```livenessProbe``` support for option ```chromeNode```, ```firefoxNode```, and ```edgeNode```. This commit adds these three Helm Chart values: - ```chromeNode.livenessProbe: {}``` - ```firefoxNode.livenessProbe {}``` - ```edgeNode.livenessProbe: {}``` The bellow properties will end up in the pod livenessProbe for the respective node pod. Fixes #1895 Co-authored-by: Diego Molina --- charts/selenium-grid/README.md | 3 +++ charts/selenium-grid/templates/_helpers.tpl | 3 +++ charts/selenium-grid/values.yaml | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/charts/selenium-grid/README.md b/charts/selenium-grid/README.md index e81dbe6bd..479a3620e 100644 --- a/charts/selenium-grid/README.md +++ b/charts/selenium-grid/README.md @@ -127,6 +127,7 @@ This table contains the configuration parameters of the chart and their default | `chromeNode.service.annotations` | `{}` | Custom annotations for service | | `chromeNode.dshmVolumeSizeLimit` | `1Gi` | Size limit for DSH volume mounted in container (if not set, default is "1Gi") | | `chromeNode.startupProbe` | `{}` | Probe to check pod is started successfully | +| `chromeNode.livenessProbe` | `{}` | Liveness probe settings | | `chromeNode.terminationGracePeriodSeconds` | `30` | Time to graceful terminate container (default: 30s) | | `chromeNode.lifecycle` | `{}` | hooks to make pod correctly shutdown or started | | `chromeNode.extraVolumeMounts` | `[]` | Extra mounts of declared ExtraVolumes into pod | @@ -161,6 +162,7 @@ This table contains the configuration parameters of the chart and their default | `firefoxNode.service.annotations` | `{}` | Custom annotations for service | | `firefoxNode.dshmVolumeSizeLimit` | `1Gi` | Size limit for DSH volume mounted in container (if not set, default is "1Gi") | | `firefoxNode.startupProbe` | `{}` | Probe to check pod is started successfully | +| `firefoxNode.livenessProbe` | `{}` | Liveness probe settings | | `firefoxNode.terminationGracePeriodSeconds` | `30` | Time to graceful terminate container (default: 30s) | | `firefoxNode.lifecycle` | `{}` | hooks to make pod correctly shutdown or started | | `firefoxNode.extraVolumeMounts` | `[]` | Extra mounts of declared ExtraVolumes into pod | @@ -195,6 +197,7 @@ This table contains the configuration parameters of the chart and their default | `edgeNode.service.annotations` | `{}` | Custom annotations for service | | `edgeNode.dshmVolumeSizeLimit` | `1Gi` | Size limit for DSH volume mounted in container (if not set, default is "1Gi") | | `edgeNode.startupProbe` | `{}` | Probe to check pod is started successfully | +| `edgeNode.livenessProbe` | `{}` | Liveness probe settings | | `edgeNode.terminationGracePeriodSeconds` | `30` | Time to graceful terminate container (default: 30s) | | `edgeNode.lifecycle` | `{}` | hooks to make pod correctly shutdown or started | | `edgeNode.extraVolumeMounts` | `[]` | Extra mounts of declared ExtraVolumes into pod | diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl index 5cd8e17a6..81ee4b52b 100644 --- a/charts/selenium-grid/templates/_helpers.tpl +++ b/charts/selenium-grid/templates/_helpers.tpl @@ -153,6 +153,9 @@ template: {{- with .node.startupProbe }} startupProbe: {{- toYaml . | nindent 10 }} {{- end }} + {{- with .node.livenessProbe }} + livenessProbe: {{- toYaml . | nindent 10 }} + {{- end }} {{- if or .Values.global.seleniumGrid.imagePullSecret .node.imagePullSecret }} imagePullSecrets: - name: {{ default .Values.global.seleniumGrid.imagePullSecret .node.imagePullSecret }} diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml index d51c3d258..306f9b576 100644 --- a/charts/selenium-grid/values.yaml +++ b/charts/selenium-grid/values.yaml @@ -429,6 +429,10 @@ chromeNode: # port: 5555 # failureThreshold: 120 # periodSeconds: 5 + + # Liveness probe settings + livenessProbe: {} + # Time to wait for pod termination terminationGracePeriodSeconds: 30 lifecycle: {} @@ -541,6 +545,10 @@ firefoxNode: # port: 5555 # failureThreshold: 120 # periodSeconds: 5 + + # Liveness probe settings + livenessProbe: {} + # Time to wait for pod termination terminationGracePeriodSeconds: 30 lifecycle: {} @@ -650,6 +658,10 @@ edgeNode: # port: 5555 # failureThreshold: 120 # periodSeconds: 5 + + # Liveness probe settings + livenessProbe: {} + # Time to wait for pod termination terminationGracePeriodSeconds: 30 lifecycle: {}