From 9e2b9d97806e9be81c48bc8c436eec2a46c6987c Mon Sep 17 00:00:00 2001
From: Vasyl Saienko <vsaienko@mirantis.com>
Date: Tue, 24 Sep 2024 15:33:59 +0000
Subject: [PATCH] Revert "[rabbitmq] Use short rabbitmq node name"

Rabbitmqcluster does not work with short node names, as
there is unresolvable dependency in dns resolution, it is
not possible to resolve only pod name svc must be added.

This reverts commit bb7580944a5268a1e5f7fcd195b156f53dc668c5.

Change-Id: I42b25ba4f569bae94bbc2939a1022bd14e66e527
---
 rabbitmq/Chart.yaml                                         | 2 +-
 rabbitmq/templates/bin/_rabbitmq-start.sh.tpl               | 2 +-
 .../monitoring/prometheus/exporter-deployment.yaml          | 2 +-
 rabbitmq/templates/statefulset.yaml                         | 6 +++---
 releasenotes/notes/rabbitmq.yaml                            | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index c87378892..2ffec46da 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.41
+version: 0.1.42
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl
index 0f84cf5a9..4ef849fd1 100644
--- a/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl
@@ -82,7 +82,7 @@ if ! [ "${POD_INCREMENT}" -eq "0" ] && ! [ -d "/var/lib/rabbitmq/mnesia" ] ; the
   # Wait for server to join cluster, reset if it does not
   POD_INCREMENT=$(echo "${MY_POD_NAME}" | awk -F '-' '{print $NF}')
   END=$(($(date +%s) + 180))
-  while ! rabbitmqctl --node $(get_node_name 0) -q cluster_status | grep -q "$(get_node_name ${POD_INCREMENT})"; do
+  while ! rabbitmqctl -l --node $(get_node_name 0) -q cluster_status | grep -q "$(get_node_name ${POD_INCREMENT})"; do
     sleep 5
     NOW=$(date +%s)
     [ $NOW -gt $END ] && reset_rabbit
diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
index 6cfc74812..b08fc8857 100644
--- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -79,7 +79,7 @@ spec:
           - name: RABBIT_TIMEOUT
             value: "{{ .Values.conf.rabbitmq_exporter.rabbit_timeout }}"
           - name: RABBIT_URL
-            value: {{  printf "%s" $protocol }}://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}:{{ tuple "oslo_messaging" "internal" $protocol . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            value: {{  printf "%s" $protocol }}://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}:{{ tuple "oslo_messaging" "internal" $protocol . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           - name: RABBIT_USER
             valueFrom:
               secretKeyRef:
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 2f2d16fc3..17400d370 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -245,13 +245,13 @@ spec:
                 fieldRef:
                   fieldPath: status.podIP
             - name: RABBITMQ_USE_LONGNAME
-              value: "false"
+              value: "true"
             - name: RABBITMQ_NODENAME
-              value: "rabbit@$(MY_POD_NAME)"
+              value: "rabbit@$(MY_POD_NAME).{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}"
             - name: K8S_SERVICE_NAME
               value: {{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
             - name: K8S_HOSTNAME_SUFFIX
-              value: ".{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}"
+              value: ".{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}"
             - name: RABBITMQ_ERLANG_COOKIE
               value: "{{ $envAll.Values.endpoints.oslo_messaging.auth.erlang_cookie }}"
             - name: PORT_HTTP
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index da012f2da..9bf7fe28e 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -41,4 +41,5 @@ rabbitmq:
   - 0.1.39 Allow to bootstrap rabbitmq with initial config
   - 0.1.40 Set password for guest user rabbitmq
   - 0.1.41 Use short rabbitmq node name
+  - 0.1.42 Revert Use short rabbitmq node name
 ...