From fae5d828bf900c36fb4cced4cafda9417ffebd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Trkan?= Date: Sun, 5 Oct 2025 22:23:35 +0200 Subject: [PATCH] feat(infrastructure): update rabbitmq env --- .../charts/myapp-chart/templates/app-deployment.yaml | 2 +- .../charts/myapp-chart/templates/rabbitmq-cluster.yaml | 10 ++++++++++ .../myapp-chart/templates/rabbitmq-permission.yaml | 8 +++----- .../charts/myapp-chart/templates/rabbitmq-queue.yaml | 6 ++---- .../charts/myapp-chart/templates/rabbitmq-user.yaml | 6 ++---- .../myapp-chart/templates/worker-deployment.yaml | 2 +- 7project/charts/myapp-chart/values.yaml | 8 +++++--- 7 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml diff --git a/7project/charts/myapp-chart/templates/app-deployment.yaml b/7project/charts/myapp-chart/templates/app-deployment.yaml index 3bb5288..b309c09 100644 --- a/7project/charts/myapp-chart/templates/app-deployment.yaml +++ b/7project/charts/myapp-chart/templates/app-deployment.yaml @@ -45,7 +45,7 @@ spec: name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} key: password - name: RABBITMQ_HOST - value: {{ .Values.rabbitmq.host | quote }} + value: {{ printf "%s.%s.svc.cluster.local" (include "rabbit.clusterName" .) .Release.Namespace | quote }} - name: RABBITMQ_PORT value: {{ .Values.rabbitmq.port | quote }} - name: RABBITMQ_VHOST diff --git a/7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml b/7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml new file mode 100644 index 0000000..511cab0 --- /dev/null +++ b/7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml @@ -0,0 +1,10 @@ +apiVersion: rabbitmq.com/v1beta1 +kind: RabbitmqCluster +metadata: + name: "rabbitmq-cluster" + namespace: {{ .Release.Namespace }} +spec: + replicas: {{ .Values.rabbitmq.replicas | default 1 }} + persistence: + storage: {{ .Values.rabbitmq.storage | default "1Gi" }} + resources: {} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml index 880398f..1c4c945 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml @@ -1,17 +1,15 @@ -{{- if .Values.rabbitmq.password }} apiVersion: rabbitmq.com/v1beta1 kind: Permission metadata: name: {{ printf "%s-permission" (.Values.rabbitmq.username | default "demo-app") }} - namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }} + namespace: {{ .Release.Namespace }} spec: rabbitmqClusterReference: - name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }} - namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }} + name: rabbitmq-cluster + namespace: {{ .Release.Namespace }} vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }} user: {{ .Values.rabbitmq.username | default "demo-app" }} permissions: configure: ".*" read: ".*" write: ".*" -{{- end }} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml index 2980934..45fd996 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml @@ -1,4 +1,3 @@ -{{- if .Values.worker.mailQueueName }} apiVersion: rabbitmq.com/v1beta1 kind: Queue metadata: @@ -6,9 +5,8 @@ metadata: namespace: {{ .Release.Namespace }} spec: rabbitmqClusterReference: - name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }} - namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }} + name: rabbitmq-cluster + namespace: {{ .Release.Namespace }} name: {{ .Values.worker.mailQueueName }} vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }} durable: true -{{- end }} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml index c336fcd..141ef60 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml @@ -1,4 +1,3 @@ -{{- if .Values.rabbitmq.password }} apiVersion: rabbitmq.com/v1beta1 kind: User metadata: @@ -6,10 +5,9 @@ metadata: namespace: {{ .Release.Namespace }} spec: rabbitmqClusterReference: - name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }} - namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }} + name: rabbitmq-cluster + namespace: {{ .Release.Namespace }} tags: - management importCredentialsSecret: name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} -{{- end }} diff --git a/7project/charts/myapp-chart/templates/worker-deployment.yaml b/7project/charts/myapp-chart/templates/worker-deployment.yaml index cb01f9d..6e82a09 100644 --- a/7project/charts/myapp-chart/templates/worker-deployment.yaml +++ b/7project/charts/myapp-chart/templates/worker-deployment.yaml @@ -39,7 +39,7 @@ spec: name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} key: password - name: RABBITMQ_HOST - value: {{ .Values.rabbitmq.host | quote }} + value: {{ printf "%s.%s.svc.cluster.local" (include "rabbit.clusterName" .) .Release.Namespace | quote }} - name: RABBITMQ_PORT value: {{ .Values.rabbitmq.port | quote }} - name: RABBITMQ_VHOST diff --git a/7project/charts/myapp-chart/values.yaml b/7project/charts/myapp-chart/values.yaml index 912d809..63207e1 100644 --- a/7project/charts/myapp-chart/values.yaml +++ b/7project/charts/myapp-chart/values.yaml @@ -33,12 +33,14 @@ service: port: 80 rabbitmq: - host: rabbitmq.rabbitmq.svc.cluster.local + create: true + replicas: 1 + storage: 1Gi + # Optional: override the generated cluster name; default is "-rabbit[-]" + clusterName: "" port: "5672" username: demo-app password: "" - namespace: rabbitmq - clusterName: rabbitmq-cluster vhost: "/" mariadb: