From 50ffb7b7b8a7b0dddec4d54238616881bb378dbd Mon Sep 17 00:00:00 2001
From: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
Date: Fri, 4 Nov 2022 13:21:43 +0800
Subject: [PATCH] Fix missing RABBITMQ_USERNAME field for new installations
 (#775)

---
 helm/oncall/templates/_env.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm/oncall/templates/_env.tpl b/helm/oncall/templates/_env.tpl
index 746669ec..cdff2fd8 100644
--- a/helm/oncall/templates/_env.tpl
+++ b/helm/oncall/templates/_env.tpl
@@ -237,15 +237,15 @@
 
 {{- define "snippet.rabbitmq.env" -}}
 {{- if eq .Values.broker.type "rabbitmq" -}}
-{{- if and (not .Values.rabbitmq.enabled) (not .Values.externalRabbitmq.existingSecret) (not .Values.externalRabbitmq.usernameKey) .Values.externalRabbitmq.user }}
-- name: RABBITMQ_USERNAME
-  value: {{ include "snippet.rabbitmq.user" . }}
-{{- else if and (not .Values.rabbitmq.enabled) .Values.externalRabbitmq.existingSecret .Values.externalRabbitmq.usernameKey (not .Values.externalRabbitmq.user) }}
+{{- if and (not .Values.rabbitmq.enabled) .Values.externalRabbitmq.existingSecret .Values.externalRabbitmq.usernameKey (not .Values.externalRabbitmq.user) }}
 - name: RABBITMQ_USERNAME
   valueFrom:
     secretKeyRef:
       name: {{ include "snippet.rabbitmq.password.secret.name" . }}
       key: {{ .Values.externalRabbitmq.usernameKey }}
+{{- else }}
+- name: RABBITMQ_USERNAME
+  value: {{ include "snippet.rabbitmq.user" . }}
 {{- end }}
 - name: RABBITMQ_PASSWORD
   valueFrom: