From b591d3aa4998b39af41c9583ae3b982a7df7b43e Mon Sep 17 00:00:00 2001
From: Vasyl Saienko <vsaienko@mirantis.com>
Date: Fri, 13 Sep 2024 09:03:35 +0000
Subject: [PATCH] [rabbitmq] Update readiness/liveness commands

Use lightweigh rabbitmqctl ping command to check readiness and liveness probe.
check_port_connectivity - is not suatable for liveness as it does not check
  that instance of rabbitmq is actually running and we can authenticate.

Change-Id: I6f157e9aef3450dba1ad7e0cb19491a41f700bbc
---
 rabbitmq/Chart.yaml                               | 2 +-
 rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl  | 2 +-
 rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl | 2 +-
 releasenotes/notes/rabbitmq.yaml                  | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index 0e1a300ca..a53546e1d 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.12.0
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.36
+version: 0.1.37
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
index d07626b23..62cb3da6a 100644
--- a/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-liveness.sh.tpl
@@ -19,5 +19,5 @@ set -e
 if [ -f /tmp/rabbit-disable-liveness-probe ]; then
    exit 0
 else
-   exec rabbitmq-diagnostics -q check_port_connectivity
+   exec rabbitmqctl ping
 fi
diff --git a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
index 14ef11cd2..bf49d9eff 100644
--- a/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
@@ -19,5 +19,5 @@ set -e
 if [ -f /tmp/rabbit-disable-readiness ]; then
    exit 1
 else
-   exec rabbitmq-diagnostics ping
+   exec rabbitmqctl ping
 fi
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index 601be9b4e..5d4889373 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -36,4 +36,5 @@ rabbitmq:
   - 0.1.34 Add 2024.1 overrides
   - 0.1.35 Add configurable probes to rabbitmq container
   - 0.1.36 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.1.37 Update rabbitmq readiness/liveness command
 ...