From 628d570a8f57768907c4c234352fa61fc1147718 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Sat, 8 Mar 2025 22:15:44 +0800 Subject: [PATCH] feat: add Redis configuration options to chat and freeleaps templates Signed-off-by: zhenyus --- freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml | 2 ++ freeleaps/helm-pkg/chat/values.alpha.yaml | 2 ++ freeleaps/helm-pkg/chat/values.prod.yaml | 2 ++ freeleaps/helm-pkg/chat/values.yaml | 6 +++++- freeleaps/helm-pkg/devsvc/values.alpha.yaml | 2 +- .../freeleaps/templates/freeleaps/freeleaps-config.yaml | 2 ++ freeleaps/helm-pkg/freeleaps/values.alpha.yaml | 2 ++ freeleaps/helm-pkg/freeleaps/values.prod.yaml | 2 ++ freeleaps/helm-pkg/freeleaps/values.yaml | 6 +++++- 9 files changed, 23 insertions(+), 3 deletions(-) diff --git a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml index 15f71100..55207d01 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml @@ -31,3 +31,5 @@ data: FREELEAPS_AILAB_ENDPOINT: {{ .Values.chat.configs.freeleapsAilabEndpoint | b64enc | quote }} FREELEAPS_ENV: {{ .Values.chat.configs.freeleapsEnv | b64enc | quote }} CERT_PATH: {{ .Values.chat.configs.certPath | b64enc | quote }} + REDIS_URL: {{ .Values.chat.configs.redisUrl | b64enc | quote }} + REDIS_IS_CLUSTER: {{ .Values.chat.configs.redisIsCluster | b64enc | quote }} diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 6b814d08..9469ee62 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -72,3 +72,5 @@ chat: freeleapsAilabEndpoint: '' freeleapsEnv: alpha certPath: '' + redisUrl: redis://r6Y@QTb*7BQN@hDGsN@freeleaps-alpha-redis-headless.freeleaps-alpha.svc.freeleaps.cluster:6379 + redisIsCluster: "false" diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index 0852e33b..92b8c802 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/freeleaps/helm-pkg/chat/values.prod.yaml @@ -55,3 +55,5 @@ chat: freeleapsAilabEndpoint: '' freeleapsEnv: chat certPath: '' + redisUrl: "redis://r6Y@QTb*7BQN@hDGsN@freeleaps-prod-redis-redis-cluster-headless.freeleaps-prod.svc.freeleaps.cluster:6379" + redisIsCluster: "true" diff --git a/freeleaps/helm-pkg/chat/values.yaml b/freeleaps/helm-pkg/chat/values.yaml index a589c818..3771d720 100644 --- a/freeleaps/helm-pkg/chat/values.yaml +++ b/freeleaps/helm-pkg/chat/values.yaml @@ -82,4 +82,8 @@ chat: # FREELEAPS_ENV freeleapsEnv: "" # CERT_PATH - certPath: "" \ No newline at end of file + certPath: "" + # REDIS_URL + redisUrl: "" + # REDIS_IS_CLUSTER + redisIsCluster: "false" \ 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 38c9bba7..efb06ce7 100644 --- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml +++ b/freeleaps/helm-pkg/devsvc/values.alpha.yaml @@ -52,7 +52,7 @@ devsvc: serviceApiAccessPort: 8007 mongodbName: freeleaps2 mongodbUri: mongodb://freeleaps-alpha-mongo-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ - giteaToken: 1d90e6eba4dbe8979878d2f55d9c7a0c2ab782df + giteaToken: 96eec0225f0b505a6ef04c14c4d03aea26f6364a giteaUrl: http://freeleaps-alpha-gitea-http.freeleaps-alpha.svc.freeleaps.cluster:3000 giteaDepotOrganization: products codeDepotHttpPort: 443 diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml index 862abb79..4e7b1259 100644 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml +++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml @@ -32,3 +32,5 @@ data: FREELEAPS_AILAB_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsAilabEndpoint | b64enc | quote }} FREELEAPS_ENV: {{ .Values.freeleaps.configs.freeleapsEnv | b64enc | quote }} CERT_PATH: {{ .Values.freeleaps.configs.certPath | b64enc | quote }} + REDIS_URL: {{ .Values.freeleaps.configs.redisUrl | b64enc | quote }} + REDIS_IS_CLUSTER: {{ .Values.freeleaps.configs.redisIsCluster | b64enc | quote }} diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index f7a7775e..00670e27 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -73,3 +73,5 @@ freeleaps: freeleapsAilabEndpoint: '' freeleapsEnv: alpha certPath: '' + redisUrl: "redis://r6Y@QTb*7BQN@hDGsN@freeleaps-prod-redis-redis-cluster-headless.freeleaps-prod.svc.freeleaps.cluster:6379" + redisIsCluster: "true" diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml index 97d07988..0c6e4f3a 100644 --- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml @@ -56,3 +56,5 @@ freeleaps: freeleapsAilabEndpoint: '' freeleapsEnv: alpha certPath: '' + redisUrl: "redis://r6Y@QTb*7BQN@hDGsN@freeleaps-prod-redis-redis-cluster-headless.freeleaps-prod.svc.freeleaps.cluster:6379" + redisIsCluster: "true" diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml index 576b0e50..f7295248 100644 --- a/freeleaps/helm-pkg/freeleaps/values.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.yaml @@ -84,4 +84,8 @@ freeleaps: # FREELEAPS_ENV freeleapsEnv: "" # CERT_PATH - certPath: "" \ No newline at end of file + certPath: "" + # REDIS_URL + redisUrl: "" + # REDIS_IS_CLUSTER + redisIsCluster: "false" \ No newline at end of file