Skip to content

Commit

Permalink
Support to nodes livenessProbe into the Helm Chart (#1897)
Browse files Browse the repository at this point in the history
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 <diemol@users.noreply.github.com>
  • Loading branch information
brunobritorj and diemol committed Aug 1, 2023
1 parent a027f26 commit fb28eea
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions charts/selenium-grid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down
3 changes: 3 additions & 0 deletions charts/selenium-grid/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
12 changes: 12 additions & 0 deletions charts/selenium-grid/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,10 @@ chromeNode:
# port: 5555
# failureThreshold: 120
# periodSeconds: 5

# Liveness probe settings
livenessProbe: {}

# Time to wait for pod termination
terminationGracePeriodSeconds: 30
lifecycle: {}
Expand Down Expand Up @@ -541,6 +545,10 @@ firefoxNode:
# port: 5555
# failureThreshold: 120
# periodSeconds: 5

# Liveness probe settings
livenessProbe: {}

# Time to wait for pod termination
terminationGracePeriodSeconds: 30
lifecycle: {}
Expand Down Expand Up @@ -650,6 +658,10 @@ edgeNode:
# port: 5555
# failureThreshold: 120
# periodSeconds: 5

# Liveness probe settings
livenessProbe: {}

# Time to wait for pod termination
terminationGracePeriodSeconds: 30
lifecycle: {}
Expand Down

0 comments on commit fb28eea

Please sign in to comment.