From ab81bc8fdab63a2e26021a530961154652742240 Mon Sep 17 00:00:00 2001 From: Emilien Devos Date: Mon, 6 Nov 2023 14:41:39 +0100 Subject: [PATCH] correctly disable by default all the things that are based on rabbitmq --- Chart.yaml | 2 +- templates/console/console-deployment.yaml | 2 +- templates/gateway/gateway-deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 058f830..d5ae5ec 100644 --- 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 index c80958e..1e2413e 100644 --- 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 index 6fc6f32..073fc94 100644 --- 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 }}