From edfa42eee5da64cec1aaf31dff019a3599a68ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Trkan?= Date: Sun, 5 Oct 2025 21:16:36 +0200 Subject: [PATCH] feat(infrastructure): update rabbitmq env --- 7project/charts/myapp-chart/templates/app-deployment.yaml | 7 ++++++- .../charts/myapp-chart/templates/worker-deployment.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/7project/charts/myapp-chart/templates/app-deployment.yaml b/7project/charts/myapp-chart/templates/app-deployment.yaml index d804e08..3bb5288 100644 --- a/7project/charts/myapp-chart/templates/app-deployment.yaml +++ b/7project/charts/myapp-chart/templates/app-deployment.yaml @@ -40,11 +40,16 @@ spec: - name: RABBITMQ_USERNAME value: {{ .Values.rabbitmq.username | quote }} - name: RABBITMQ_PASSWORD - value: {{ required "Set .Values.rabbitmq.password" .Values.rabbitmq.password | quote }} + valueFrom: + secretKeyRef: + name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} + key: password - name: RABBITMQ_HOST value: {{ .Values.rabbitmq.host | quote }} - name: RABBITMQ_PORT value: {{ .Values.rabbitmq.port | quote }} + - name: RABBITMQ_VHOST + value: {{ .Values.rabbitmq.vhost | default "/" | quote }} - name: MAIL_QUEUE value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }} livenessProbe: diff --git a/7project/charts/myapp-chart/templates/worker-deployment.yaml b/7project/charts/myapp-chart/templates/worker-deployment.yaml index c366575..cb01f9d 100644 --- a/7project/charts/myapp-chart/templates/worker-deployment.yaml +++ b/7project/charts/myapp-chart/templates/worker-deployment.yaml @@ -34,10 +34,15 @@ spec: - name: RABBITMQ_USERNAME value: {{ .Values.rabbitmq.username | quote }} - name: RABBITMQ_PASSWORD - value: {{ required "Set .Values.rabbitmq.password" .Values.rabbitmq.password | quote }} + valueFrom: + secretKeyRef: + name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} + key: password - name: RABBITMQ_HOST value: {{ .Values.rabbitmq.host | quote }} - name: RABBITMQ_PORT value: {{ .Values.rabbitmq.port | quote }} + - name: RABBITMQ_VHOST + value: {{ .Values.rabbitmq.vhost | default "/" | quote }} - name: MAIL_QUEUE value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}