patch helm broker env variable issue (#2927)

## Which issue(s) this PR fixes

#2885 

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)

CHANGELOG.md

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Performance and UX tweaks to integrations page ([#2869](https://github.com/grafana/oncall/pull/2869))
 - Expand users details in filter swaps internal endpoint ([#2921](https://github.com/grafana/oncall/pull/2921))
 
+### Fixed
+
+- Fix issue with helm chart when specifying `broker.type=rabbitmq` where Redis environment variables
+  were not longer being injected @joeyorlando ([#2927](https://github.com/grafana/oncall/pull/2927))
+
 ## v1.3.29 (2023-08-29)
 
 ### Fixed

Makefile

@@ -199,7 +199,7 @@ test-dev:  ## very similar to `test` command, but allows you to pass arbitray ar
 	$(call run_backend_tests,$(ARGS))
 
 test-helm:  ## run helm unit tests
-	helm unittest ./helm/oncall
+	helm unittest ./helm/oncall $(ARGS)
 
 start-celery-beat:  ## start celery beat
 	$(call run_engine_docker_command,celery -A engine beat -l info)

helm/oncall/templates/_env.tpl

@@ -529,13 +529,8 @@
 {{- end }}
 
 {{- define "snippet.broker.env" -}}
-{{- if eq .Values.broker.type "redis" }}
 {{- include "snippet.redis.env" . }}
-{{- else if eq .Values.broker.type "rabbitmq" }}
 {{- include "snippet.rabbitmq.env" . }}
-{{- else -}}
-{{- fail "value for .Values.broker.type must be either 'redis' or 'rabbitmq'" }}
-{{- end }}
 {{- end }}
 
 {{- define "snippet.db.env" -}}

helm/oncall/tests/__snapshot__/telegram_polling_deployment_test.yaml.snap

@@ -52,6 +52,15 @@ telegramPolling.enabled=true -> should create telegram polling deployment:
             secretKeyRef:
               key: mariadb-root-password
               name: oncall-mariadb
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD

helm/oncall/tests/__snapshot__/wait_for_db_test.yaml.snap

@@ -44,6 +44,15 @@ database.type=mysql -> should create initContainer for MySQL database (default):
             secretKeyRef:
               key: mariadb-root-password
               name: oncall-mariadb
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD
@@ -115,6 +124,15 @@ database.type=mysql -> should create initContainer for MySQL database (default):
             secretKeyRef:
               key: mariadb-root-password
               name: oncall-mariadb
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD
@@ -186,6 +204,15 @@ database.type=mysql -> should create initContainer for MySQL database (default):
             secretKeyRef:
               key: mariadb-root-password
               name: oncall-mariadb
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD
@@ -260,6 +287,15 @@ database.type=postgresql -> should create initContainer for PostgreSQL database:
             secretKeyRef:
               key: postgres-password
               name: oncall-postgresql-external
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD
@@ -333,6 +369,15 @@ database.type=postgresql -> should create initContainer for PostgreSQL database:
             secretKeyRef:
               key: postgres-password
               name: oncall-postgresql-external
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD
@@ -406,6 +451,15 @@ database.type=postgresql -> should create initContainer for PostgreSQL database:
             secretKeyRef:
               key: postgres-password
               name: oncall-postgresql-external
+        - name: REDIS_HOST
+          value: oncall-redis-master
+        - name: REDIS_PORT
+          value: "6379"
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: redis-password
+              name: oncall-redis
         - name: RABBITMQ_USERNAME
           value: user
         - name: RABBITMQ_PASSWORD

helm/oncall/tests/redis_env_test.yaml

@@ -109,7 +109,6 @@ tests:
       - celery/deployment.yaml
     set:
       broker.type: redis
-      rabbitmq.enabled: false
       redis.enabled: false
       externalRedis:
         host: custom-host