From 691a503cfae86ddaa2564d561d4e52dd0ffa4ef2 Mon Sep 17 00:00:00 2001
From: Ruslan Gainanov <gromrx1@gmail.com>
Date: Fri, 16 Jun 2023 06:14:36 +0300
Subject: [PATCH] fix existingSecret for RabbitMQ to default value (see #761)
 (#864)

**What this PR does**:
The existing value brokes the release when using external RabbitMQ.
```
 Warning  Failed     6s (x11 over 112s)  kubelet            Error: couldn't find key password in Secret monitoring/oncall-rabbitmq-external
```

**Which issue(s) this PR fixes**:
Related MR [#761](https://github.com/grafana/oncall/pull/761)

**Checklist**
- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated

---------

Co-authored-by: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
---
 CHANGELOG.md                             | 4 ++++
 helm/oncall/tests/rabbitmq_env_test.yaml | 2 +-
 helm/oncall/values.yaml                  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcaa718d..8ca77442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Change .Values.externalRabbitmq.passwordKey from `password` to `""` (default value `rabbitmq-password`) [864](https://github.com/grafana/oncall/pull/864)
+
 ### Added
 
 - Add `locale` column to mobile app user settings table by @joeyorlando [#2131](https://github.com/grafana/oncall/pull/2131)
diff --git a/helm/oncall/tests/rabbitmq_env_test.yaml b/helm/oncall/tests/rabbitmq_env_test.yaml
index 438d2d45..a969ccd4 100644
--- a/helm/oncall/tests/rabbitmq_env_test.yaml
+++ b/helm/oncall/tests/rabbitmq_env_test.yaml
@@ -177,7 +177,7 @@ tests:
             name: RABBITMQ_PASSWORD
             valueFrom:
               secretKeyRef:
-                key: password
+                key: rabbitmq-password
                 name: oncall-rabbitmq-external
       - containsDocument:
           kind: Secret
diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml
index 248108e2..9c974780 100644
--- a/helm/oncall/values.yaml
+++ b/helm/oncall/values.yaml
@@ -320,7 +320,7 @@ externalRabbitmq:
   # use an existing secret for the rabbitmq password
   existingSecret: ""
   # the key in the secret containing the rabbitmq password
-  passwordKey: password
+  passwordKey: ""
   # the key in the secret containing the rabbitmq username
   usernameKey: username