diff --git a/charts/opennotificaties/Chart.yaml b/charts/opennotificaties/Chart.yaml index 9bcb5ff..b5748b1 100644 --- a/charts/opennotificaties/Chart.yaml +++ b/charts/opennotificaties/Chart.yaml @@ -3,7 +3,7 @@ name: opennotificaties description: API voor het routeren van notificaties type: application -version: 1.6.0-beta.3 +version: 1.7.0-beta.0 appVersion: latest dependencies: diff --git a/charts/opennotificaties/README.md b/charts/opennotificaties/README.md index e86484f..8e86f98 100644 --- a/charts/opennotificaties/README.md +++ b/charts/opennotificaties/README.md @@ -1,6 +1,6 @@ # opennotificaties -![Version: 1.6.0-beta.1](https://img.shields.io/badge/Version-1.6.0--beta.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) +![Version: 1.7.0-beta.0](https://img.shields.io/badge/Version-1.7.0--beta.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) API voor het routeren van notificaties @@ -209,8 +209,10 @@ API voor het routeren van notificaties | worker.autoscaling.targetCPUUtilizationPercentage | int | `80` | | | worker.autoscaling.targetMemoryUtilizationPercentage | int | `80` | | | worker.concurrency | int | `4` | | -| worker.livenessProbe.exec.command[0] | string | `"python"` | | -| worker.livenessProbe.exec.command[1] | string | `"/app/bin/check_celery_worker_liveness.py"` | | +| worker.livenessProbe.enabled | bool | `false` | | +| worker.livenessProbe.exec.command[0] | string | `"/bin/sh"` | | +| worker.livenessProbe.exec.command[1] | string | `"-c"` | | +| worker.livenessProbe.exec.command[2] | string | `"celery --workdir src --app nrc.celery inspect --destination celery@${HOSTNAME} active"` | | | worker.livenessProbe.failureThreshold | int | `10` | | | worker.livenessProbe.initialDelaySeconds | int | `60` | | | worker.livenessProbe.periodSeconds | int | `50` | | diff --git a/charts/opennotificaties/templates/deployment.yaml b/charts/opennotificaties/templates/deployment.yaml index 2c2773a..b8781fd 100644 --- a/charts/opennotificaties/templates/deployment.yaml +++ b/charts/opennotificaties/templates/deployment.yaml @@ -178,10 +178,16 @@ spec: {{- if .Values.extraEnvVars }} {{- include "opennotificaties.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} - {{- if .Values.worker.livenessProbe }} + {{- if .Values.worker.livenessProbe.enabled }} livenessProbe: - {{- toYaml .Values.worker.livenessProbe | nindent 12 }} - {{- end }} + exec: + {{- toYaml .Values.worker.livenessProbe.exec | nindent 14 }} + initialDelaySeconds: {{ .Values.worker.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.worker.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.worker.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.worker.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.worker.livenessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.worker.resources | nindent 12 }} command: diff --git a/charts/opennotificaties/values.yaml b/charts/opennotificaties/values.yaml index bbf4380..8a57ca7 100644 --- a/charts/opennotificaties/values.yaml +++ b/charts/opennotificaties/values.yaml @@ -335,10 +335,12 @@ worker: resources: {} maxWorkerLivenessDelta: "" livenessProbe: + enabled: false exec: command: - - python - - /app/bin/check_celery_worker_liveness.py + - /bin/sh + - -c + - celery --workdir src --app nrc.celery inspect --destination celery@${HOSTNAME} active initialDelaySeconds: 60 # Periodeseconds should not exceed maxWorkerLivenessDelta periodSeconds: 50