From d41fd25a055dd70312e7c42660e678571dfe4b9f Mon Sep 17 00:00:00 2001 From: zhenyus Date: Sat, 22 Feb 2025 18:58:47 +0800 Subject: [PATCH] chore(git): code staging Signed-off-by: zhenyus --- .../alpha/ci/freeleaps-service-hub/Jenkinsfile | 2 +- .../helm-pkg/authentication/values.alpha.yaml | 2 +- .../helm-pkg/central-storage/values.alpha.yaml | 4 ++-- freeleaps/helm-pkg/content/values.alpha.yaml | 2 +- .../helm-pkg/notification/values.alpha.yaml | 18 +++++++++--------- freeleaps/helm-pkg/payment/values.alpha.yaml | 2 +- freeleaps/helm-pkg/secrets.alpha.yml | 13 ------------- 7 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 freeleaps/helm-pkg/secrets.alpha.yml diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile index 59ee5650..a948db99 100644 --- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile @@ -7,7 +7,7 @@ executeFreeleapsPipeline { serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/freeleaps-service-hub/_git/freeleaps-service-hub" serviceGitRepoType = 'monorepo' serviceGitCredentialsId = 'freeleaps-azure-devops-credentials' - executeMode = 'on-demand' + executeMode = 'fully' commitMessageLintEnabled = true components = [ [ diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index 323c912b..82eac3bb 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml @@ -57,7 +57,7 @@ authentication: # NOTIFICATION_WEBAPI_URL_BASE notificationWebapiUrlBase: "http://notification.svc.freeleaps-alpha.freeleaps.cluster:8003/api/notification" # JWT_SECRET_KEY - jwtSecretKey: "" + jwtSecretKey: "8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b" # JWT_ALGORITHM jwtAlgorithm: "HS256" # SERVICE_API_ACCESS_HOST diff --git a/freeleaps/helm-pkg/central-storage/values.alpha.yaml b/freeleaps/helm-pkg/central-storage/values.alpha.yaml index 7883a2bd..f82cd3a0 100644 --- a/freeleaps/helm-pkg/central-storage/values.alpha.yaml +++ b/freeleaps/helm-pkg/central-storage/values.alpha.yaml @@ -63,6 +63,6 @@ central-storage: # MONGODB_URI mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/" # AZURE_STORAGE_DOCUMENT_API_KEY - azureStorageDocumentApiKey: "" + azureStorageDocumentApiKey: "xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ==" # AZURE_STORAGE_DOCUMENT_API_ENDPOINT - azureStorageDocumentApiEndpoint: "" + azureStorageDocumentApiEndpoint: "https://freeleaps1document.blob.core.windows.net/" diff --git a/freeleaps/helm-pkg/content/values.alpha.yaml b/freeleaps/helm-pkg/content/values.alpha.yaml index d672f856..1c6eb4b0 100644 --- a/freeleaps/helm-pkg/content/values.alpha.yaml +++ b/freeleaps/helm-pkg/content/values.alpha.yaml @@ -63,7 +63,7 @@ content: # MONGODB_URI mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/" # FREELEAPS_WWW_AS_AZURE_CLIENT_SECRET - freeleapsWwwAsAzureClientSecret: "" + freeleapsWwwAsAzureClientSecret: "jTu8Q~WceiK-5dfZB44Ww-K4fVGi3_5tHNWYYbdX" # CENTRAL_STORAGE_WEBAPI_URL_BASE centralStorageWebapiUrlBase: "http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage" diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 68c0efb3..03362085 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -57,20 +57,20 @@ content: # SERVICE_API_ACCESS_PORT serviceApiAccessPort: "8003" # RABBITMQ_HOST - rabbitmqHost: "" + rabbitmqHost: "freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster" # RABBITMQ_PORT - rabbitmqPort: "" + rabbitmqPort: "5672" # SYSTEM_USER_ID - systemUserId: "" + systemUserId: "117f191e810c19729de860aa" # SMS_FROM - smsFrom: "" + smsFrom: "+16898887156" # EMAIL_FROM - emailFrom: "" + emailFrom: "freeleaps@freeleaps.com" # SECRET_KEY - secretKey: "" + secretKey: "ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0" # SENDGRID_API_KEY - sendgridApiKey: "" + sendgridApiKey: "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" # TWILIO_ACCOUNT_SID - twilioAccountSid: "" + twilioAccountSid: "ACf8c9283a6acda060258eadb29be58bc8" # TWILIO_AUTH_TOKEN - twilioAuthToken: "" \ No newline at end of file + twilioAuthToken: "ef160748cc22c8b7195b49df4b8eca7e" \ 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 c523595c..129d3d26 100644 --- a/freeleaps/helm-pkg/payment/values.alpha.yaml +++ b/freeleaps/helm-pkg/payment/values.alpha.yaml @@ -46,4 +46,4 @@ payment: # MONGODB_URI mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/" # STRIPE_API_KEY - stripeApiKey: "" \ No newline at end of file + stripeApiKey: "sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd" \ No newline at end of file diff --git a/freeleaps/helm-pkg/secrets.alpha.yml b/freeleaps/helm-pkg/secrets.alpha.yml deleted file mode 100644 index 93fd612b..00000000 --- a/freeleaps/helm-pkg/secrets.alpha.yml +++ /dev/null @@ -1,13 +0,0 @@ -JWT_SECRET_KEY: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b -AZURE_STORAGE_DOCUMENT_API_KEY: xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ== -AZURE_STORAGE_DOCUMENT_API_ENDPOINT: https://freeleaps1document.blob.core.windows.net/ -FREELEAPS_WWW_AS_AZURE_CLIENT_SECRET: jTu8Q~WceiK-5dfZB44Ww-K4fVGi3_5tHNWYYbdX -SYSTEM_USER_ID: 117f191e810c19729de860aa -SMS_FROM: +16898887156 -EMAIL_FROM: freeleaps@freeleaps.com -SECRET_KEY: ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0 -SENDGRID_API_KEY: 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 -TWILIO_ACCOUNT_SID: ACf8c9283a6acda060258eadb29be58bc8 -TWILIO_AUTH_TOKEN: ef160748cc22c8b7195b49df4b8eca7e -STRIPE_API_KEY: sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd -RabbitMQ version? what is this \ No newline at end of file