From 5aa7f5b959bb9ff0c94950da84b4a48f2e1368ef Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 22 May 2024 08:54:34 +0200 Subject: [PATCH] [bitnami/mastodon] Use different liveness/readiness probes (#26126) * [bitnami/Mastodon] Use different liveness/readiness probes Signed-off-by: David Gomez * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: David Gomez Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/mastodon/CHANGELOG.md | 7 ++++++- bitnami/mastodon/Chart.lock | 12 ++++++------ bitnami/mastodon/Chart.yaml | 2 +- bitnami/mastodon/README.md | 1 - bitnami/mastodon/templates/sidekiq/deployment.yaml | 6 +++--- bitnami/mastodon/templates/streaming/deployment.yaml | 3 +-- bitnami/mastodon/templates/web/deployment.yaml | 3 +-- bitnami/mastodon/values.yaml | 4 ---- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/bitnami/mastodon/CHANGELOG.md b/bitnami/mastodon/CHANGELOG.md index bc4a50712e4f90..c925926219c7b5 100644 --- a/bitnami/mastodon/CHANGELOG.md +++ b/bitnami/mastodon/CHANGELOG.md @@ -1,8 +1,13 @@ # Changelog +## 6.1.1 (2024-05-21) + +* [bitnami/mastodon] Use different liveness/readiness probes ([#26126](https://github.com/bitnami/charts/pulls/26126)) + ## 6.1.0 (2024-05-21) -* [bitnami/mastodon] feat: :sparkles: :lock: Add warning when original images are replaced ([#26238](https://github.com/bitnami/charts/pulls/26238)) +* [bitnami/*] ci: :construction_worker: Add tag and changelog support (#25359) ([91c707c](https://github.com/bitnami/charts/commit/91c707c)), closes [#25359](https://github.com/bitnami/charts/issues/25359) +* [bitnami/mastodon] feat: :sparkles: :lock: Add warning when original images are replaced (#26238) ([d8f42ab](https://github.com/bitnami/charts/commit/d8f42ab)), closes [#26238](https://github.com/bitnami/charts/issues/26238) ## 6.0.3 (2024-05-18) diff --git a/bitnami/mastodon/Chart.lock b/bitnami/mastodon/Chart.lock index 853102fb15d56b..20364c95f595d6 100644 --- a/bitnami/mastodon/Chart.lock +++ b/bitnami/mastodon/Chart.lock @@ -1,21 +1,21 @@ dependencies: - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 19.3.4 + version: 19.4.0 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts - version: 15.3.5 + version: 15.4.0 - name: elasticsearch repository: oci://registry-1.docker.io/bitnamicharts - version: 21.0.7 + version: 21.1.0 - name: minio repository: oci://registry-1.docker.io/bitnamicharts - version: 14.5.0 + version: 14.6.0 - name: apache repository: oci://registry-1.docker.io/bitnamicharts version: 11.0.6 - name: common repository: oci://registry-1.docker.io/bitnamicharts version: 2.19.3 -digest: sha256:2ecbf0a2110d5173cfe9d86abc54a97654b0b7930f6dd55ed3bb94d802365bef -generated: "2024-05-21T14:07:19.245850871+02:00" +digest: sha256:f00a135fd3b56a3341d191aa5351648e5d58656e527fefec41ec0807ca166ed8 +generated: "2024-05-21T18:04:37.879578+02:00" diff --git a/bitnami/mastodon/Chart.yaml b/bitnami/mastodon/Chart.yaml index 649e8dbb8901a8..0e9e751993a7b6 100644 --- a/bitnami/mastodon/Chart.yaml +++ b/bitnami/mastodon/Chart.yaml @@ -49,4 +49,4 @@ maintainers: name: mastodon sources: - https://github.com/bitnami/charts/tree/main/bitnami/mastodon -version: 6.1.0 +version: 6.1.1 diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 095250f0a07d5c..e1778d3d8b2ac9 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -783,7 +783,6 @@ The [Bitnami mastodon](https://github.com/bitnami/containers/tree/main/bitnami/m | `apache.service.loadBalancerIP` | Apache service LoadBalancer IP | `""` | | `apache.service.ports.http` | Apache service port | `80` | | `apache.vhostsConfigMap` | Name of the ConfigMap containing the Apache vhost configuration | `""` | -| `apache.livenessProbe.path` | Apache liveness probe path | `/api/v1/streaming/health` | | `apache.readinessProbe.path` | Apache readiness probe path | `/api/v1/streaming/health` | | `apache.startupProbe.path` | Apache startup probe path | `/api/v1/streaming/health` | | `apache.ingress.enabled` | Enable ingress | `false` | diff --git a/bitnami/mastodon/templates/sidekiq/deployment.yaml b/bitnami/mastodon/templates/sidekiq/deployment.yaml index d8b3adde0bc1d0..ed549008ada248 100644 --- a/bitnami/mastodon/templates/sidekiq/deployment.yaml +++ b/bitnami/mastodon/templates/sidekiq/deployment.yaml @@ -181,9 +181,9 @@ spec: livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.sidekiq.livenessProbe "enabled") "context" $) | nindent 12 }} exec: command: - - /bin/sh - - -c - - pgrep -f ^sidekiq + - pgrep + - -f + - sidekiq {{- end }} {{- if .Values.sidekiq.customReadinessProbe }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.customReadinessProbe "context" $) | nindent 12 }} diff --git a/bitnami/mastodon/templates/streaming/deployment.yaml b/bitnami/mastodon/templates/streaming/deployment.yaml index ef825f3c036437..33c595b267053c 100644 --- a/bitnami/mastodon/templates/streaming/deployment.yaml +++ b/bitnami/mastodon/templates/streaming/deployment.yaml @@ -182,8 +182,7 @@ spec: livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.streaming.customLivenessProbe "context" $) | nindent 12 }} {{- else if .Values.streaming.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.streaming.livenessProbe "enabled") "context" $) | nindent 12 }} - httpGet: - path: /api/v1/streaming/health + tcpSocket: port: http {{- end }} {{- if .Values.streaming.customReadinessProbe }} diff --git a/bitnami/mastodon/templates/web/deployment.yaml b/bitnami/mastodon/templates/web/deployment.yaml index 9c3f933811b73e..7546bb915c6cc2 100644 --- a/bitnami/mastodon/templates/web/deployment.yaml +++ b/bitnami/mastodon/templates/web/deployment.yaml @@ -238,8 +238,7 @@ spec: livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.web.customLivenessProbe "context" $) | nindent 12 }} {{- else if .Values.web.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.web.livenessProbe "enabled") "context" $) | nindent 12 }} - httpGet: - path: /health + tcpSocket: port: http {{- end }} {{- if .Values.web.customReadinessProbe }} diff --git a/bitnami/mastodon/values.yaml b/bitnami/mastodon/values.yaml index 0d4b5c83a1f00a..433d5fb9017c1b 100644 --- a/bitnami/mastodon/values.yaml +++ b/bitnami/mastodon/values.yaml @@ -1845,10 +1845,6 @@ apache: # We need to change the liveness probe to use the Mastodon streaming health checkpoint # We use the streaming because it is the last service to be initialized together with # sidekiq - ## @param apache.livenessProbe.path Apache liveness probe path - ## - livenessProbe: - path: "/api/v1/streaming/health" ## @param apache.readinessProbe.path Apache readiness probe path ## readinessProbe: