Merge pull request #1106 from CodeWithEmad/fix/celery-broker-url

fix: celery broker URL

Author: bmtcril

tutoraspects/patches/k8s-deployments

@@ -191,6 +191,8 @@ spec:
               value: "{{ REDIS_HOST }}"
             - name: REDIS_PORT
               value: "{{ REDIS_PORT }}"
+            - name: REDIS_USERNAME
+              value: "{{ REDIS_USERNAME }}"
             - name: REDIS_PASSWORD
               value: "{{ REDIS_PASSWORD }}"
             - name: FLASK_DEBUG

tutoraspects/patches/k8s-jobs

@@ -139,6 +139,8 @@ spec:
             value: "{{ REDIS_HOST }}"
           - name: REDIS_PORT
             value: "{{ REDIS_PORT }}"
+          - name: REDIS_USERNAME
+            value: "{{ REDIS_USERNAME }}"
           - name: REDIS_PASSWORD
             value: "{{ REDIS_PASSWORD }}"
           - name: FLASK_DEBUG

tutoraspects/templates/aspects/apps/superset/pythonpath/superset_config.py

@@ -72,6 +72,7 @@ def get_env_variable(var_name: str, default: Optional[str] = None) -> str:
 REDIS_CELERY_DB = get_env_variable("REDIS_CELERY_DB", "3")
 REDIS_RESULTS_DB = get_env_variable("REDIS_RESULTS_DB", "4")
 REDIS_CACHE_DB = get_env_variable("REDIS_CACHE_DB", "5")
+REDIS_USERNAME = get_env_variable("REDIS_USERNAME", "") or "default"
 REDIS_PASSWORD = get_env_variable("REDIS_PASSWORD", "")
 
 RESULTS_BACKEND = RedisCache(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWORD, db=REDIS_RESULTS_DB, key_prefix='superset_results')
@@ -83,6 +84,7 @@ def get_env_variable(var_name: str, default: Optional[str] = None) -> str:
     "CACHE_REDIS_HOST": REDIS_HOST,
     "CACHE_REDIS_PORT": REDIS_PORT,
     'CACHE_REDIS_PASSWORD': REDIS_PASSWORD,
+    'CACHE_REDIS_USERNAME': REDIS_USERNAME,
     "CACHE_REDIS_DB": REDIS_RESULTS_DB,
 }
 DATA_CACHE_CONFIG = CACHE_CONFIG
@@ -103,10 +105,15 @@ def get_env_variable(var_name: str, default: Optional[str] = None) -> str:
     **CACHE_CONFIG,
 }
 
-class CeleryConfig(object):
-    BROKER_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_CELERY_DB}"
+class CeleryConfig:
+    if REDIS_PASSWORD:
+        _redis_auth = f"{REDIS_USERNAME + ':' if REDIS_USERNAME else ''}{REDIS_PASSWORD}@"
+    else:
+        _redis_auth = ""
+
+    BROKER_URL = f"redis://{_redis_auth}{REDIS_HOST}:{REDIS_PORT}/{REDIS_CELERY_DB}"
     CELERY_IMPORTS = ("superset.sql_lab", "superset.tasks", "superset.tasks.thumbnails",)
-    CELERY_RESULT_BACKEND = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_RESULTS_DB}"
+    CELERY_RESULT_BACKEND = f"redis://{_redis_auth}{REDIS_HOST}:{REDIS_PORT}/{REDIS_RESULTS_DB}"
     CELERYD_LOG_LEVEL = "DEBUG"
     CELERYD_PREFETCH_MULTIPLIER = 1
     CELERY_ACKS_LATE = False

tutoraspects/templates/base-docker-compose-services

@@ -23,6 +23,7 @@ image: {{ DOCKER_IMAGE_SUPERSET }}
     PYTHONPATH: /app/pythonpath:/app/docker/pythonpath_dev
     REDIS_HOST: {{ REDIS_HOST }}
     REDIS_PORT: {{ REDIS_PORT }}
+    REDIS_USERNAME: {{ REDIS_USERNAME }}
     REDIS_PASSWORD: {{ REDIS_PASSWORD }}
     SUPERSET_HOST: {{ SUPERSET_HOST }}
     SUPERSET_PORT: {{ SUPERSET_PORT }}