From a2791e37b70db31a55f271f4b2ccc93f210f95fe Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Thu, 31 Jul 2025 16:07:20 +0800
Subject: [PATCH] feat(devsvc): add RabbitMQ and Docker registry configuration
 options

- Introduced RabbitMQ configuration parameters including host, port, username, password, and virtual host.
- Added default Git and Docker registry credentials for improved deployment flexibility.
- Updated configuration template to include new parameters for RabbitMQ and Docker registry.

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../templates/devsvc/devsvc-config.yaml       | 11 ++++++++++
 freeleaps/helm-pkg/devsvc/values.alpha.yaml   | 11 ++++++++++
 freeleaps/helm-pkg/devsvc/values.yaml         | 22 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml
index c1955bce..84700a25 100644
--- a/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml
+++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml
@@ -21,3 +21,14 @@ data:
   PROBES_ENABLED: {{ .Values.devsvc.configs.probesEnabled | default false | toString | b64enc }}
   LOG_BASE_PATH: {{ .Values.devsvc.configs.logBasePath | default "/app/log/devsvc" | b64enc | quote }}
   APPLICATION_ACTIVITY_LOG: {{ .Values.devsvc.configs.appName | default "devsvc" | printf "%s-application-activity" | b64enc | quote }}
+  RABBITMQ_HOST: {{ .Values.devsvc.configs.rabbitmqHost | b64enc | quote }}
+  RABBITMQ_PORT: {{ .Values.devsvc.configs.rabbitmqPort | toString | b64enc }}
+  RABBITMQ_USERNAME: {{ .Values.devsvc.configs.rabbitmqUsername | b64enc | quote }}
+  RABBITMQ_PASSWORD: {{ .Values.devsvc.configs.rabbitmqPassword | b64enc | quote }}
+  RABBITMQ_VIRTUAL_HOST: {{ .Values.devsvc.configs.rabbitmqVirtualHost | b64enc | quote }}
+  DEFAULT_GIT_USERNAME: {{ .Values.devsvc.configs.defaultGitUsername | b64enc | quote }}
+  DEFAULT_GIT_PASSWORD: {{ .Values.devsvc.configs.defaultGitPassword | b64enc | quote }}
+  DEFAULT_DOCKER_REGISTRY_URL: {{ .Values.devsvc.configs.defaultDockerRegistryUrl | b64enc | quote }}
+  DEFAULT_DOCKER_REGISTRY_REPOSITORY_NAME: {{ .Values.devsvc.configs.defaultDockerRegistryRepositoryName | b64enc | quote }}
+  DEVOPS_DOCKER_REGISTRY_USERNAME: {{ .Values.devsvc.configs.devopsDockerRegistryUsername | b64enc | quote }}
+  DEVOPS_DOCKER_REGISTRY_PASSWORD: {{ .Values.devsvc.configs.devopsDockerRegistryPassword | b64enc | quote }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/devsvc/values.alpha.yaml b/freeleaps/helm-pkg/devsvc/values.alpha.yaml
index 86fe6234..9fa7f22a 100644
--- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml
+++ b/freeleaps/helm-pkg/devsvc/values.alpha.yaml
@@ -91,6 +91,17 @@ devsvc:
     metricsEnabled: 'false'
     probesEnabled: 'true'
     logBasePath: /app/log/devsvc
+    rabbitmqHost: freeleaps-alpha-rabbitmq-cluster.freeleaps-alpha.svc.freeleaps.cluster
+    rabbitmqPort: 5672
+    rabbitmqUsername: user
+    rabbitmqPassword: 4O80YlxnlhHrjzaM
+    rabbitmqVirtualHost: /
+    defaultGitUsername: freeleaps
+    defaultGitPassword: r8sA8CPHD9!bt6d
+    defaultDockerRegistryUrl: https://hub.docker.com
+    defaultDockerRegistryRepositoryName: freeleapsdevops
+    devopsDockerRegistryUsername: freeleapsdevops
+    devopsDockerRegistryPassword: dckr_pat_y-KsBOwcEGTdCQDsAb-NBz9_beg
   vpa:
     minAllowed:
       enabled: false
diff --git a/freeleaps/helm-pkg/devsvc/values.yaml b/freeleaps/helm-pkg/devsvc/values.yaml
index 07105b9a..9745a26d 100644
--- a/freeleaps/helm-pkg/devsvc/values.yaml
+++ b/freeleaps/helm-pkg/devsvc/values.yaml
@@ -76,6 +76,28 @@ devsvc:
     metricsEnabled: "false"
     # PROBES_ENABLED
     probesEnabled: "false"
+    # RABBITMQ_HOST
+    rabbitmqHost: ""
+    # RABBITMQ_PORT
+    rabbitmqPort: ""
+    # RABBITMQ_USERNAME
+    rabbitmqUsername: ""
+    # RABBITMQ_PASSWORD
+    rabbitmqPassword: ""
+    # RABBITMQ_VIRTUAL_HOST
+    rabbitmqVirtualHost: ""
+    # DEFAULT_GIT_USERNAME
+    defaultGitUsername: ""
+    # DEFAULT_GIT_PASSWORD
+    defaultGitPassword: ""
+    # DEFAULT_DOCKER_REGISTRY_URL
+    defaultDockerRegistryUrl: ""
+    # DEFAULT_DOCKER_REGISTRY_REPOSITORY_NAME
+    defaultDockerRegistryRepositoryName: ""
+    # DEVOPS_DOCKER_REGISTRY_USERNAME
+    devopsDockerRegistryUsername: ""
+    # DEVOPS_DOCKER_REGISTRY_PASSWORD
+    devopsDockerRegistryPassword: ""
   vpa:
     minAllowed:
       enabled: false