feat(infrastructure): update rabbitmq env

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

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: {}

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" }}
+    name: rabbitmq-cluster
-    namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+    namespace: {{ .Release.Namespace }}
   vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }}
   user: {{ .Values.rabbitmq.username | default "demo-app" }}
   permissions:
     configure: ".*"
     read: ".*"
     write: ".*"
-{{- end }}

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" }}
+    name: rabbitmq-cluster
-    namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+    namespace: {{ .Release.Namespace }}
   name: {{ .Values.worker.mailQueueName }}
   vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }}
   durable: true
-{{- end }}

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" }}
+    name: rabbitmq-cluster
-    namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+    namespace: {{ .Release.Namespace }}
   tags:
     - management
   importCredentialsSecret:
     name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
-{{- end }}

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

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 "<app.name>-rabbit[-<deployment>]"
+  clusterName: ""
   port: "5672"
   username: demo-app
   password: ""
-  namespace: rabbitmq
-  clusterName: rabbitmq-cluster
   vhost: "/"
 
 mariadb: