From 4b37c1fd60a05c7f14a34356c9dd3367b9cbbcf9 Mon Sep 17 00:00:00 2001
From: Vasyl Saienko <vsaienko@mirantis.com>
Date: Fri, 13 Sep 2024 09:20:34 +0000
Subject: [PATCH] [rabbitmq] Do not use hardcoded username in rabbitmq chown
 container

Pick up UID from .Values.pod.security_context.server.pod.runAsUser as this is
user that we are using to run service.

Change-Id: Id4c53b0a882b027e320b08ed766cb473ab9ab535
---
 rabbitmq/Chart.yaml                 | 2 +-
 rabbitmq/templates/statefulset.yaml | 2 +-
 releasenotes/notes/rabbitmq.yaml    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index a53546e1d..71d715071 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.37
+version: 0.1.38
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 8a4c8b735..81d3c8bf2 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -182,7 +182,7 @@ spec:
           command:
             - chown
             - -R
-            - "rabbitmq:"
+            - "{{ $envAll.Values.pod.security_context.server.pod.runAsUser }}"
             - /var/lib/rabbitmq
           volumeMounts:
             - name: pod-tmp
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index 5d4889373..17fb17bde 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -37,4 +37,5 @@ rabbitmq:
   - 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
+  - 0.1.38 Do not use hardcoded username in rabbitmq chown container
 ...