Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix livenessProbe #169

Merged
merged 2 commits into from
Jun 28, 2024
Merged

fix livenessProbe #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f96665
fix livenessProbe
dirsigler Jun 28, 2024
2fb1fd1
upgrade Kind test cluster versions
dirsigler Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ name: Lint and Test Charts
on:
pull_request:
paths:
- 'charts/uptime-kuma/templates/**'
- 'charts/uptime-kuma/Chart.yaml'
- "charts/uptime-kuma/templates/**"
- "charts/uptime-kuma/Chart.yaml"

jobs:
lint-test:
runs-on: ubuntu-latest
strategy:
matrix:
k8s:
- v1.24.13
- v1.25.9
- v1.26.4
- v1.27.2
- v1.28.9
- v1.29.4
- v1.30.0
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion charts/uptime-kuma/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ name: uptime-kuma
sources:
- https://github.com/louislam/uptime-kuma
type: application
version: 2.19.0
version: 2.19.1
21 changes: 18 additions & 3 deletions charts/uptime-kuma/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# uptime-kuma

![Version: 2.19.0](https://img.shields.io/badge/Version-2.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.23.13](https://img.shields.io/badge/AppVersion-1.23.13-informational?style=flat-square)
![Version: 2.19.1](https://img.shields.io/badge/Version-2.19.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.23.13](https://img.shields.io/badge/AppVersion-1.23.13-informational?style=flat-square)

A self-hosted Monitoring tool like "Uptime-Robot".

Expand Down Expand Up @@ -40,7 +40,11 @@ A self-hosted Monitoring tool like "Uptime-Robot".
| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | |
| ingress.tls | list | `[]` | |
| livenessProbe.enabled | bool | `true` | |
| livenessProbe.initialDelaySeconds | int | `15` | |
| livenessProbe.exec.command[0] | string | `"extra/healthcheck"` | |
| livenessProbe.failureThreshold | int | `3` | |
| livenessProbe.initialDelaySeconds | int | `180` | |
| livenessProbe.periodSeconds | int | `10` | |
| livenessProbe.successThreshold | int | `1` | |
| livenessProbe.timeoutSeconds | int | `2` | |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
Expand All @@ -50,7 +54,16 @@ A self-hosted Monitoring tool like "Uptime-Robot".
| podLabels | object | `{}` | |
| podSecurityContext | object | `{}` | |
| readinessProbe.enabled | bool | `true` | |
| readinessProbe.initialDelaySeconds | int | `5` | |
| readinessProbe.exec.command | list | `[]` | |
| readinessProbe.failureThreshold | int | `3` | |
| readinessProbe.httpGet.httpHeaders | list | `[]` | |
| readinessProbe.httpGet.path | string | `"/"` | |
| readinessProbe.httpGet.port | int | `3001` | |
| readinessProbe.httpGet.scheme | string | `"HTTP"` | |
| readinessProbe.initialDelaySeconds | int | `10` | |
| readinessProbe.periodSeconds | int | `10` | |
| readinessProbe.successThreshold | int | `1` | |
| readinessProbe.timeoutSeconds | int | `1` | |
| resources | object | `{}` | |
| securityContext | object | `{}` | |
| service.annotations | object | `{}` | |
Expand Down Expand Up @@ -79,3 +92,5 @@ A self-hosted Monitoring tool like "Uptime-Robot".
| volume.existingClaim | string | `""` | |
| volume.size | string | `"4Gi"` | |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
40 changes: 30 additions & 10 deletions charts/uptime-kuma/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,41 @@ spec:
{{- end }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
{{- if .Values.livenessProbe.enabled }}
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
{{- if .Values.livenessProbe.exec.command }}
exec:
command:
- node
- extra/healthcheck
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds}}
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
{{- toYaml .Values.livenessProbe.exec.command | nindent 16 }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
{{- if .Values.readinessProbe.enabled }}
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
{{- if .Values.readinessProbe.exec.command }}
exec:
command:
{{- toYaml .Values.readinessProbe.exec.command | nindent 16 }}
{{- else if .Values.readinessProbe.httpGet.path }}
httpGet:
path: /
port: 3001
scheme: HTTP
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
{{- end }}
path: {{ .Values.readinessProbe.httpGet.path }}
port: {{ .Values.readinessProbe.httpGet.port }}
scheme: {{ .Values.readinessProbe.httpGet.scheme }}
{{- if .Values.readinessProbe.httpGet.httpHeaders }}
httpHeaders:
{{- toYaml .Values.readinessProbe.httpGet.httpHeaders | nindent 16 }}
{{- end }}
{{- end }}
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
25 changes: 23 additions & 2 deletions charts/uptime-kuma/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,33 @@ affinity: {}

livenessProbe:
enabled: true
failureThreshold: 3
# Uptime-Kuma recommends to configure a delay of 180 seconds until the server fully started.
# https://github.com/louislam/uptime-kuma/blob/ae224f9e188b1fc32ed8729818710975589cdce7/extra/healthcheck.go#L3
initialDelaySeconds: 180
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 2
initialDelaySeconds: 15
# The NodeJS Version of this Healthcheck is no longer supported, therefore we don't specify a node command.
# https://github.com/louislam/uptime-kuma/blob/ae224f9e188b1fc32ed8729818710975589cdce7/extra/healthcheck.js#L6
exec:
command:
- "extra/healthcheck"

readinessProbe:
enabled: true
initialDelaySeconds: 5
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
failureThreshold: 3
successThreshold: 1
exec:
command: []
httpGet:
path: /
port: 3001
scheme: HTTP
httpHeaders: []

volume:
enabled: true
Expand Down
Loading