fixup! feat: using toggle-django-helm as base

Author: thenav56

helm/values-alpha.yaml

@@ -9,26 +9,21 @@ app:
   # NOTE: Check main/settings.py for all available options
   secrets:
     # - Celery
-    # CELERY_BROKER_URL: Defined using extraEnvVars
+    # CELERY_RABBITMQ_CONNECTION_STRING: Defined using extraEnvVars
+    # CELERY_RABBITMQ_VHOST: Defined using extraEnvVars
     CELERY_RESULT_BACKEND: "redis://alert-hub-dragonfly:6379/0"
     # - Cache
     CACHE_REDIS_URL: "redis://alert-hub-dragonfly:6379/1"
-    # Healthcheck
-    # HEALTHCHECK_RABBITMQ_URL: Defined using extraEnvVars
-    HEALTHCHECK_REDIS_URL: "redis://alert-hub-dragonfly:6379/1"
 
   extraEnvVars:
     # Checkout the resources defined by extraManifests
-    - name: CELERY_BROKER_URL
-      valueFrom:
-        secretKeyRef:
-          name: alert-hub-rabbitmq-default-user
-          key: connection_string
-    - name: HEALTHCHECK_RABBITMQ_URL
+    - name: CELERY_RABBITMQ_CONNECTION_STRING
       valueFrom:
         secretKeyRef:
           name: alert-hub-rabbitmq-default-user
           key: connection_string
+    - name: CELERY_RABBITMQ_VHOST
+      value: celery
 
   extraManifests:
     dragonflydb-cluster:
@@ -51,11 +46,13 @@ app:
         snapshot:
           cron: "*/5 * * * *"
           persistentVolumeClaimSpec:
+            # storageClassName:
             accessModes:
             - ReadWriteOnce
             resources:
               requests:
                 storage: 1Gi
+    # RabbitMQ
     rabbitmq-cluster:
       apiVersion: rabbitmq.com/v1beta1
       kind: RabbitmqCluster
@@ -65,10 +62,15 @@ app:
         replicas: 1  # Scaling down is not supported
         resources:
           requests:
-            cpu: "0.1"
+            cpu: "100m"
             memory: "2Gi"
           limits:
             cpu: "4"
             memory: "2Gi"
+        rabbitmq:
+          additionalConfig: |
+            default_vhost = celery
+            default_user = alerthub
         persistence:
-         storage: "500Mi"
+         # storageClassName:
+         storage: "2Gi"

helm/values.yaml

@@ -178,10 +178,8 @@ app:
     HCAPTCHA_SITEKEY: "{{ required \".app.secrets.HCAPTCHA_SITEKEY\" nil }}"
     HCAPTCHA_SECRET: "{{ required \".app.secrets.HCAPTCHA_SECRET\" nil }}"
     # - Celery
-    # CELERY_BROKER_URL:
+    # CELERY_RABBITMQ_CONNECTION_STRING:
+    # CELERY_RABBITMQ_VHOST:
     # CELERY_RESULT_BACKEND:  "redis://{{ printf \"%s-master\" (include \"common.names.fullname\" $.Subcharts.redis) }}:6379/0"
     # - Cache
     # CACHE_REDIS_URL: "redis://{{ printf \"%s-master\" (include \"common.names.fullname\" $.Subcharts.redis) }}:6379/1"
-    # Healthcheck
-    # HEALTHCHECK_RABBITMQ_URL:
-    # HEALTHCHECK_REDIS_URL: "redis://{{ printf \"%s-master\" (include \"common.names.fullname\" $.Subcharts.redis) }}:6379/1"