From ce933aa605ae0388e27061efed9e7619ef7a10b8 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Sun, 23 Feb 2025 00:14:48 +0800 Subject: [PATCH] fix(config): update service API access port and MongoDB URI formatting in configuration files Signed-off-by: zhenyus --- .../templates/authentication/central-storage-config.yaml | 4 ++-- freeleaps/helm-pkg/central-storage/values.alpha.yaml | 6 +++--- freeleaps/helm-pkg/content/templates/content-config.yaml | 4 ++-- freeleaps/helm-pkg/content/values.alpha.yaml | 6 +++--- .../notification/templates/notification-config.yaml | 4 ++-- freeleaps/helm-pkg/notification/values.alpha.yaml | 4 ++-- freeleaps/helm-pkg/payment/templates/payment-config.yaml | 4 ++-- freeleaps/helm-pkg/payment/values.alpha.yaml | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/freeleaps/helm-pkg/central-storage/templates/authentication/central-storage-config.yaml b/freeleaps/helm-pkg/central-storage/templates/authentication/central-storage-config.yaml index a55ac459..4da16152 100644 --- a/freeleaps/helm-pkg/central-storage/templates/authentication/central-storage-config.yaml +++ b/freeleaps/helm-pkg/central-storage/templates/authentication/central-storage-config.yaml @@ -8,9 +8,9 @@ data: TZ: {{ .Values.central-storage.configs.tz | b64enc | quote }} APP_NAME: {{ .Values.central-storage.configs.appName | b64enc | quote }} SERVICE_API_ACCESS_HOST: {{ .Values.central-storage.configs.serviceApiAccessHost | b64enc | quote }} - SERVICE_API_ACCESS_PORT: {{ .Values.central-storage.configs.serviceApiAccessPort | b64enc | quote }} + SERVICE_API_ACCESS_PORT: {{ .Values.central-storage.configs.serviceApiAccessPort | toString | b64enc }} MONGODB_NAME: {{ .Values.central-storage.configs.mongodbName | b64enc | quote }} - MONGODB_PORT: {{ .Values.central-storage.configs.mongodbPort | b64enc | quote }} + MONGODB_PORT: {{ .Values.central-storage.configs.mongodbPort | toString | b64enc }} MONGODB_URI: {{ .Values.central-storage.configs.mongodbUri | b64enc | quote }} AZURE_STORAGE_DOCUMENT_API_KEY: {{ .Values.central-storage.configs.azureStorageDocumentApiKey | b64enc | quote }} AZURE_STORAGE_DOCUMENT_API_ENDPOINT: {{ .Values.central-storage.configs.azureStorageDocumentApiEndpoint | b64enc | quote }} diff --git a/freeleaps/helm-pkg/central-storage/values.alpha.yaml b/freeleaps/helm-pkg/central-storage/values.alpha.yaml index d321de72..94e191f0 100644 --- a/freeleaps/helm-pkg/central-storage/values.alpha.yaml +++ b/freeleaps/helm-pkg/central-storage/values.alpha.yaml @@ -49,9 +49,9 @@ central-storage: tz: America/Settle appName: central_storage serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: '8005' + serviceApiAccessPort: 8005 mongodbName: freeleaps2 - mongodbPort: '27017' - mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ + mongodbPort: 27017 + mongodbUri: mongodb://freeleaps-alpha-mongo-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ azureStorageDocumentApiKey: xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ== azureStorageDocumentApiEndpoint: https://freeleaps1document.blob.core.windows.net/ diff --git a/freeleaps/helm-pkg/content/templates/content-config.yaml b/freeleaps/helm-pkg/content/templates/content-config.yaml index 73673edf..d17cc5b0 100644 --- a/freeleaps/helm-pkg/content/templates/content-config.yaml +++ b/freeleaps/helm-pkg/content/templates/content-config.yaml @@ -8,9 +8,9 @@ data: TZ: {{ .Values.content.configs.tz | b64enc | quote }} APP_NAME: {{ .Values.content.configs.appName | b64enc | quote }} SERVICE_API_ACCESS_HOST: {{ .Values.content.configs.serviceApiAccessHost | b64enc | quote }} - SERVICE_API_ACCESS_PORT: {{ .Values.content.configs.serviceApiAccessPort | b64enc | quote }} + SERVICE_API_ACCESS_PORT: {{ .Values.content.configs.serviceApiAccessPort | toString | b64enc }} MONGODB_NAME: {{ .Values.content.configs.mongodbName | b64enc | quote }} - MONGODB_PORT: {{ .Values.content.configs.mongodbPort | b64enc | quote }} + MONGODB_PORT: {{ .Values.content.configs.mongodbPort | toString | b64enc }} MONGODB_URI: {{ .Values.content.configs.mongodbUri | b64enc | quote }} FREELEAPS_WWW_AS_AZURE_CLIENT_SECRET: {{ .Values.content.configs.freeleapsWwwAsAzureClientSecret | b64enc | quote }} CENTRAL_STORAGE_WEBAPI_URL_BASE: {{ .Values.content.configs.centralStorageWebapiUrlBase | b64enc | quote }} diff --git a/freeleaps/helm-pkg/content/values.alpha.yaml b/freeleaps/helm-pkg/content/values.alpha.yaml index 93b6d097..d6ed3cc2 100644 --- a/freeleaps/helm-pkg/content/values.alpha.yaml +++ b/freeleaps/helm-pkg/content/values.alpha.yaml @@ -49,9 +49,9 @@ content: tz: America/Settle appName: content serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: '8013' + serviceApiAccessPort: 8013 mongodbName: freeleaps2 - mongodbPort: '27017' - mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ + mongodbPort: 27017 + mongodbUri: mongodb://freeleaps-alpha-mongo-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ freeleapsWwwAsAzureClientSecret: jTu8Q~WceiK-5dfZB44Ww-K4fVGi3_5tHNWYYbdX centralStorageWebapiUrlBase: http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage diff --git a/freeleaps/helm-pkg/notification/templates/notification-config.yaml b/freeleaps/helm-pkg/notification/templates/notification-config.yaml index f3711be7..f1fa638e 100644 --- a/freeleaps/helm-pkg/notification/templates/notification-config.yaml +++ b/freeleaps/helm-pkg/notification/templates/notification-config.yaml @@ -8,9 +8,9 @@ data: TZ: {{ .Values.notification.configs.tz | b64enc | quote }} APP_NAME: {{ .Values.notification.configs.appName | b64enc | quote }} SERVICE_API_ACCESS_HOST: {{ .Values.notification.configs.serviceApiAccessHost | b64enc | quote }} - SERVICE_API_ACCESS_PORT: {{ .Values.notification.configs.serviceApiAccessPort | b64enc | quote }} + SERVICE_API_ACCESS_PORT: {{ .Values.notification.configs.serviceApiAccessPort | toString | b64enc }} RABBITMQ_HOST: {{ .Values.notification.configs.rabbitmqHost | b64enc | quote }} - RABBITMQ_PORT: {{ .Values.notification.configs.rabbitmqPort | b64enc | quote }} + RABBITMQ_PORT: {{ .Values.notification.configs.rabbitmqPort | toString | b64enc }} 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 }} diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 7a19c8cb..6efee326 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -49,9 +49,9 @@ notification: tz: America/Settle appName: notification serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: '8003' + serviceApiAccessPort: 8003 rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster - rabbitmqPort: '5672' + rabbitmqPort: 5672 systemUserId: 117f191e810c19729de860aa smsFrom: '+16898887156' emailFrom: freeleaps@freeleaps.com diff --git a/freeleaps/helm-pkg/payment/templates/payment-config.yaml b/freeleaps/helm-pkg/payment/templates/payment-config.yaml index e3e6d8f0..64d97abf 100644 --- a/freeleaps/helm-pkg/payment/templates/payment-config.yaml +++ b/freeleaps/helm-pkg/payment/templates/payment-config.yaml @@ -8,9 +8,9 @@ data: TZ: {{ .Values.payment.configs.tz | b64enc | quote }} APP_NAME: {{ .Values.payment.configs.appName | b64enc | quote }} SERVICE_API_ACCESS_HOST: {{ .Values.payment.configs.serviceApiAccessHost | b64enc | quote }} - SERVICE_API_ACCESS_PORT: {{ .Values.payment.configs.serviceApiAccessPort | b64enc | quote }} + SERVICE_API_ACCESS_PORT: {{ .Values.payment.configs.serviceApiAccessPort | toString | b64enc }} MONGODB_NAME: {{ .Values.payment.configs.mongodbName | b64enc | quote }} - MONGODB_PORT: {{ .Values.payment.configs.mongodbPort | b64enc | quote }} + MONGODB_PORT: {{ .Values.payment.configs.mongodbPort | toString | b64enc }} MONGODB_URI: {{ .Values.payment.configs.mongodbUri | b64enc | quote }} STRIPE_API_KEY: {{ .Values.payment.configs.stripeApiKey | b64enc | quote }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/payment/values.alpha.yaml b/freeleaps/helm-pkg/payment/values.alpha.yaml index ef9affc1..11f1940b 100644 --- a/freeleaps/helm-pkg/payment/values.alpha.yaml +++ b/freeleaps/helm-pkg/payment/values.alpha.yaml @@ -49,8 +49,8 @@ payment: tz: America/Settle appName: payment serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: '8006' + serviceApiAccessPort: 8006 mongodbName: freeleaps2 - mongodbPort: '27017' - mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ + mongodbPort: 27017 + mongodbUri: mongodb://freeleaps-alpha-mongo-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ stripeApiKey: sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd