correctly disable by default all the things that are based on rabbitmq

georchestra · Nov 6, 2023 · ab81bc8 · ab81bc8
1 parent bf93a8d
commit ab81bc8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -32,5 +32,5 @@ dependencies:
 - name: rabbitmq
   version: ~12.1.4
   repository: "https://charts.bitnami.com/bitnami/"
-  condition: rabbitmq.builtin, rabbitmq.enabled
+  condition: rabbitmq.enabled, rabbitmq.builtin
   alias: rabbitmq
diff --git a/templates/console/console-deployment.yaml b/templates/console/console-deployment.yaml
@@ -35,7 +35,7 @@ spec:
           {{- include "georchestra.common-envs" . | nindent 10 }}
           {{- include "georchestra.ldap-envs" . | nindent 10 }}
           {{- include "georchestra.database-georchestra-envs" . | nindent 10 }}
-          {{- if $rabbitmq.enabled -}}
+          {{- if .Values.rabbitmq.enabled -}}
           {{- include "georchestra.rabbitmq-georchestra-envs" . | nindent 10 }}
           {{- end }}
           {{- if $webapp.extra_environment }}

diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml
@@ -38,7 +38,7 @@ spec:
           {{- include "georchestra.common-envs" . | nindent 10 }}
           {{- include "georchestra.ldap-envs" . | nindent 10 }}
           {{- include "georchestra.database-georchestra-envs" . | nindent 10 }}
-          {{- if $rabbitmq.enabled -}}
+          {{- if .Values.rabbitmq.enabled -}}
           {{- include "georchestra.rabbitmq-georchestra-envs" . | nindent 10 }}
           {{- end }}
           {{- if $webapp.extra_environment }}