From 4ed583108bbab220f4d3a86b7f38f198fa44211c Mon Sep 17 00:00:00 2001
From: Sylvain <35365065+sanderegg@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:53:12 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8Redis:=20add=20optional=20Redis=20u?=
 =?UTF-8?q?sername=20(#6381)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env-devel                  | 1 +
 services/docker-compose.yml | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/.env-devel b/.env-devel
index 4689f29edf5..4a28dc33cf1 100644
--- a/.env-devel
+++ b/.env-devel
@@ -161,6 +161,7 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_PASSWORD=adminadmin
 REDIS_SECURE=false
+REDIS_USER=null
 
 REGISTRY_AUTH=True
 REGISTRY_PW=adminadminadmin
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index db562f687d1..eea7ae1726b 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -119,6 +119,7 @@ services:
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REGISTRY_USER: ${REGISTRY_USER}
       REGISTRY_PW: ${REGISTRY_PW}
       REGISTRY_URL: ${REGISTRY_URL}
@@ -211,6 +212,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       SWARM_STACK_NAME: ${SWARM_STACK_NAME}
       CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES: ${CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES}
@@ -341,6 +343,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       REGISTRY_AUTH: ${REGISTRY_AUTH}
@@ -492,6 +495,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       RESOURCE_USAGE_TRACKER_LOGLEVEL: ${RESOURCE_USAGE_TRACKER_LOGLEVEL}
       RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED}
@@ -518,6 +522,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
       DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
@@ -681,6 +686,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       # WEBSERVER_REST
@@ -870,6 +876,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       RESOURCE_MANAGER_RESOURCE_TTL_S: ${RESOURCE_MANAGER_RESOURCE_TTL_S}
@@ -919,6 +926,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       SWARM_STACK_NAME: ${SWARM_STACK_NAME}
@@ -1059,6 +1067,7 @@ services:
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       S3_ACCESS_KEY: ${S3_ACCESS_KEY}
       S3_BUCKET_NAME: ${S3_BUCKET_NAME}