From 29f8919e2ba19b53925bac60dd2e7ac10d6f9855 Mon Sep 17 00:00:00 2001 From: YuehuCao Date: Fri, 1 Aug 2025 21:44:52 +0800 Subject: [PATCH] feat(notification): add MongoDB URI configuration --- .../notification/notification-config.yaml | 3 ++- .../helm-pkg/notification/values.alpha.yaml | 14 +++++++++----- freeleaps/helm-pkg/notification/values.prod.yaml | 16 ++++++++++------ freeleaps/helm-pkg/notification/values.yaml | 10 ++++++++++ 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml index e8bfe28f..cae1887d 100644 --- a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml +++ b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml @@ -17,7 +17,8 @@ data: SYSTEM_USER_ID: {{ .Values.notification.configs.systemUserId | b64enc | quote }} SMS_FROM: {{ .Values.notification.configs.smsFrom | b64enc | quote }} EMAIL_FROM: {{ .Values.notification.configs.emailFrom | b64enc | quote }} - SECRET_KEY: {{ .Values.notification.configs.secretKey | b64enc | quote }} + JWT_SECRET_KEY: {{ .Values.notification.configs.jwtsecretKey | b64enc | quote }} + JWT_ALGORITHM: {{ .Values.notification.configs.jwtAlgorithm | b64enc | quote }} SENDGRID_API_KEY: {{ .Values.notification.configs.sendgridApiKey | b64enc | quote }} TWILIO_ACCOUNT_SID: {{ .Values.notification.configs.twilioAccountSid | b64enc | quote }} TWILIO_AUTH_TOKEN: {{ .Values.notification.configs.twilioAuthToken | b64enc | quote }} diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index d0af765e..106ba5d9 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -78,20 +78,24 @@ notification: configs: tz: UTC appName: notification + jwtsecretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b + jwtAlgorithm: HS256 serviceApiAccessHost: 0.0.0.0 serviceApiAccessPort: 8003 + mongodbName: freeleaps2 + mongodbPort: 27017 + mongodbUri: mongodb+srv://jetli:8IHKx6dZK8BfugGp@freeleaps2.hanbj.mongodb.net/ rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster rabbitmqPort: 5672 rabbitmqUsername: user rabbitmqPassword: 4O80YlxnlhHrjzaM rabbitmqVritualHost: / systemUserId: 117f191e810c19729de860aa - smsFrom: '+16898887156' + smsFrom: '+16898887156' emailFrom: freeleaps@freeleaps.com - secretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b - sendgridApiKey: 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 - twilioAccountSid: ACf8c9283a6acda060258eadb29be58bc8 - twilioAuthToken: ef160748cc22c8b7195b49df4b8eca7e + sendgridApiKey: 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 + twilioAccountSid: ACf8c9283a6acda060258eadb29be58bc8 + twilioAuthToken: ef160748cc22c8b7195b49df4b8eca7e metricsEnabled: 'false' probesEnabled: 'true' vpa: diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml index 62e9effe..677eb864 100644 --- a/freeleaps/helm-pkg/notification/values.prod.yaml +++ b/freeleaps/helm-pkg/notification/values.prod.yaml @@ -66,18 +66,22 @@ notification: appName: notification serviceApiAccessHost: 0.0.0.0 serviceApiAccessPort: 8003 + mongodbName: freeleaps2 + mongodbPort: 27017 + mongodbUri: mongodb+srv://freeadmin:0eMV0bt8oyaknA0m@freeleaps2.zmsmpos.mongodb.net/?retryWrites=true&w=majority rabbitmqHost: freeleaps-prod-rabbitmq-headless.freeleaps-prod.svc.freeleaps.cluster rabbitmqPort: 5672 rabbitmqUsername: user rabbitmqPassword: D3b0HKz71T0OcYF8 rabbitmqVritualHost: / - systemUserId: 117f191e810c19729de860aa - smsFrom: '+16898887156' + systemUserId: 117f191e810c19729de860aa + smsFrom: '+16898887156' emailFrom: freeleaps@freeleaps.com - secretKey: ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0 - sendgridApiKey: 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 - twilioAccountSid: ACf8c9283a6acda060258eadb29be58bc8 - twilioAuthToken: ef160748cc22c8b7195b49df4b8eca7e + jwtsecretKey: ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0 + jwtAlgorithm: HS256 + sendgridApiKey: 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 + twilioAccountSid: ACf8c9283a6acda060258eadb29be58bc8 + twilioAuthToken: ef160748cc22c8b7195b49df4b8eca7e metricsEnabled: 'true' probesEnabled: 'true' vpa: diff --git a/freeleaps/helm-pkg/notification/values.yaml b/freeleaps/helm-pkg/notification/values.yaml index 221c3bcd..e25e0c80 100644 --- a/freeleaps/helm-pkg/notification/values.yaml +++ b/freeleaps/helm-pkg/notification/values.yaml @@ -55,6 +55,16 @@ notification: serviceApiAccessHost: "0.0.0.0" # SERVICE_API_ACCESS_PORT serviceApiAccessPort: "8003" + # JWT_SECRET_KEY + jwtsecretKey: "" + # JWT_ALGORITHM + jwtAlgorithm: "HS256" + # MONGODB_NAME + mongodbName: "" + # MONGODB_PORT + mongodbPort: "27017" + # MONGODB_URI + mongodbUri: "" # RABBITMQ_HOST rabbitmqHost: "" # RABBITMQ_PORT