chore: Fixes for rabbitmq (#31)

* chore: fixes for rabbit subchart * bump chart
PostHog · Aug 30, 2023 · 6cd6a07 · 6cd6a07
1 parent ff3790c
commit 6cd6a07
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/charts/housewatch/Chart.yaml b/charts/housewatch/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: housewatch
 description: Open source tool for monitoring and managing ClickHouse clusters
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: "0.1.1"
 dependencies:
   - name: postgresql

diff --git a/charts/housewatch/charts/postgresql-12.10.0.tgz b/charts/housewatch/charts/postgresql-12.10.0.tgz
diff --git a/charts/housewatch/charts/rabbitmq-12.1.3.tgz b/charts/housewatch/charts/rabbitmq-12.1.3.tgz
diff --git a/charts/housewatch/templates/deployment-web.yaml b/charts/housewatch/templates/deployment-web.yaml
@@ -59,8 +59,8 @@ spec:
             value: "{{ .Values.clickhouse.ca }}"
           - name: DATABASE_URL
             value: "{{ . | tpl .Values.database_url }}"
-          - name: RABBITMQ_URL 
-            value: "{{ . | tpl .Values.rabbitmq_url}}"
+          - name: RABBITMQ_URL
+            value: "amqp://{{ .Values.rabbitmq.auth.username }}:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:5672/" 
           livenessProbe:
             httpGet:
               path: /

diff --git a/charts/housewatch/templates/deployment-worker.yaml b/charts/housewatch/templates/deployment-worker.yaml
@@ -51,7 +51,7 @@ spec:
             value: "{{ .Values.clickhouse.ca }}"
           - name: DATABASE_URL
             value: "{{ . | tpl .Values.database_url }}"
-          - name: RABBITMQ_URL 
-            value: "{{ . | tpl .Values.rabbitmq_url}}"
+          - name: RABBITMQ_URL
+            value: "amqp://{{ .Values.rabbitmq.auth.username }}:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:5672/" 
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
diff --git a/charts/housewatch/values.yaml b/charts/housewatch/values.yaml
@@ -53,11 +53,11 @@ postgresql:
     username: housewatch
     password: housewatch
 
-rabbitmq_url: amqp://housewatch:housewatch@{{ include "rabbitmq.primary.fullname" .Subcharts.rabbitmq}}:5672
 rabbitmq:
   auth:
     username: housewatch
     password: housewatch
+    erlangCookie: housewatch
 
 redis:
   image: