fix env rabbitmq

gateway/adapter/mqttClient.go

@@ -23,10 +23,19 @@ func (client *RabbitMQClient) init() {
 		log.Fatal("RABBITMQ_SERVER environment variable is not set")
 		return
 	}
-
-	endpoint := os.Getenv("RABBITMQ_SERVER")
+	endpoint := os.Getenv("RABBITMQ_USERNAME")
+  if os.Getenv("RABBITMQ_USERNAME") == "" {
+		log.Fatal("RABBITMQ_USERNAME environment variable is not set")
+		return
+	}
+	username := os.Getenv("RABBITMQ_USERNAME")
+  if os.Getenv("RABBITMQ_PASSWORD") == "" {
+		log.Fatal("RABBITMQ_PASSWORD environment variable is not set")
+		return
+	}
+	password := os.Getenv("RABBITMQ_PASSWORD")
 	var err error
-	client.conn, err = amqp.Dial("amqp://guest:guest@"+endpoint)
+	client.conn, err = amqp.Dial("amqp://"+username+":"+password+"@"+endpoint)
 	failOnError(err, "Failed to connect to RabbitMQ")
 }
 

gateway/dataManager/mqttClient.go

@@ -26,10 +26,19 @@ func (rabbitMQClient *RabbitMQClient) init(alerter *Alerter) {
 		log.Fatal("RABBITMQ_SERVER environment variable is not set")
 		return
 	}
-
-	endpoint := os.Getenv("RABBITMQ_SERVER")
-    var err error
-	rabbitMQClient.conn, err = amqp.Dial("amqp://guest:guest@"+endpoint)
+	endpoint := os.Getenv("RABBITMQ_USERNAME")
+  if os.Getenv("RABBITMQ_USERNAME") == "" {
+		log.Fatal("RABBITMQ_USERNAME environment variable is not set")
+		return
+	}
+	username := os.Getenv("RABBITMQ_USERNAME")
+  if os.Getenv("RABBITMQ_PASSWORD") == "" {
+		log.Fatal("RABBITMQ_PASSWORD environment variable is not set")
+		return
+	}
+	password := os.Getenv("RABBITMQ_PASSWORD")
+	var err error
+	client.conn, err = amqp.Dial("amqp://"+username+":"+password+"@"+endpoint)
 	failOnError(err, "Failed to connect to RabbitMQ")
     rabbitMQClient.alerter = alerter
 }

gateway/manifests/base/adapter.yaml

@@ -21,6 +21,13 @@ spec:
               value: "8080"
             - name: RABBITMQ_SERVER
               value: "rabbitmq:5672"
+            - name: RABBITMQ_USERNAME
+              value: user
+            - name: RABBITMQ_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: rabbitmq
+                  key: rabbitmq-password
           ports:
             - name: http
               containerPort: 8080

gateway/manifests/base/dataManager.yaml

@@ -19,6 +19,13 @@ spec:
           env:
             - name: RABBITMQ_SERVER
               value: "rabbitmq:5672"
+            - name: RABBITMQ_USERNAME
+              value: user
+            - name: RABBITMQ_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: rabbitmq
+                  key: rabbitmq-password
           resources:
             requests:
               cpu: "100m"

gateway/manifests/base/kustomization.yml

@@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - adapter.yaml
-  - dataManager.yaml
+  - dataManager.yaml
+  - rabbitMQ.yaml

gateway/manifests/base/rabbitMQ.yaml

@@ -0,0 +1,15 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: rabbitmq
+spec:
+  interval: 60m
+  chart:
+    spec:
+      chart: rabbitmq
+      version: "15.0.3"
+      sourceRef:
+        kind: HelmRepository
+        name: bitnami
+      interval: 12h
+  values: {}

manifests/base/bitnami-helm-repository.yaml

@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: bitnami

manifests/base/kustomization.yaml

@@ -1,9 +1,9 @@
 resources:
   - bitnami-helm-repository.yaml
-  - mongodb
-  - prometheus
-  - grafana
-  - keycloak
-  - ../../cloud/backend/alert-management/manifests/base
-  - ../../cloud/backend/patient-management/manifests/base
+  #- mongodb
+  #- prometheus
+  #- grafana
+  #- keycloak
+  #- ../../cloud/backend/alert-management/manifests/base
+  #- ../../cloud/backend/patient-management/manifests/base
   - ../../gateway/manifests/base