From 8ea5aa126dfc71f2195fa38952c8645328e5cc25 Mon Sep 17 00:00:00 2001 From: sunhaolou Date: Wed, 17 Sep 2025 11:43:51 +0800 Subject: [PATCH] fix: add the new subscription secret --- freeleaps/helm-pkg/chat/templates/chat/deployment.yaml | 4 ++-- freeleaps/helm-pkg/chat/values.alpha.yaml | 4 ++++ freeleaps/helm-pkg/chat/values.prod.yaml | 4 ++++ freeleaps/helm-pkg/chat/values.yaml | 8 ++++++-- .../freeleaps/templates/freeleaps/deployment.yaml | 4 ++-- freeleaps/helm-pkg/freeleaps/values.alpha.yaml | 4 ++++ freeleaps/helm-pkg/freeleaps/values.prod.yaml | 4 ++++ freeleaps/helm-pkg/freeleaps/values.yaml | 6 +++++- 8 files changed, 31 insertions(+), 7 deletions(-) diff --git a/freeleaps/helm-pkg/chat/templates/chat/deployment.yaml b/freeleaps/helm-pkg/chat/templates/chat/deployment.yaml index d331e732..9da578fa 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/deployment.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/deployment.yaml @@ -47,7 +47,7 @@ spec: name: {{ $port.name }} protocol: {{ $port.protocol }} {{- end }} - {{- if .Values.chat.resources }} + {{- if .Values.chat.resources }} resources: {{- toYaml .Values.chat.resources | nindent 12 }} {{- end }} @@ -103,7 +103,7 @@ spec: {{- end}} env: {{- range $key, $value := .Values.chat.configs }} - {{- if not (or (eq $key "mongodbUri") (eq $key "jwtSecretKey") (eq $key "stripeApiKey") (eq $key "stripeWebhookSecret") (eq $key "stripeAccountWebhookSecret") (eq $key "rabbitmqPassword") (eq $key "redisUrl")) }} + {{- if not (or (eq $key "mongodbUri") (eq $key "jwtSecretKey") (eq $key "stripeApiKey") (eq $key "stripeWebhookSecret") (eq $key "stripeAccountWebhookSecret") (eq $key "stripeSubscriptionWebhookSecret") (eq $key "rabbitmqPassword") (eq $key "redisUrl")) }} - name: {{ $key | snakecase | upper }} valueFrom: secretKeyRef: diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 460b37e3..83b6e262 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -130,6 +130,10 @@ chat: remoteRef: key: freeleaps-alpha-stripe-account-webhook-secret type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: freeleaps-alpha-stripe-subscription-webhook-secret + type: Secret - key: rabbitmqPassword remoteRef: key: freeleaps-alpha-rabbitmq-password diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index 401ea3b7..53d76b80 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/freeleaps/helm-pkg/chat/values.prod.yaml @@ -121,6 +121,10 @@ chat: remoteRef: key: freeleaps-prod-stripe-account-webhook-secret type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: freeleaps-prod-stripe-subscription-webhook-secret + type: Secret - key: rabbitmqPassword remoteRef: key: freeleaps-prod-rabbitmq-password diff --git a/freeleaps/helm-pkg/chat/values.yaml b/freeleaps/helm-pkg/chat/values.yaml index dbc37753..906d6e2a 100644 --- a/freeleaps/helm-pkg/chat/values.yaml +++ b/freeleaps/helm-pkg/chat/values.yaml @@ -89,7 +89,7 @@ chat: # RABBITMQ_HOST rabbitmqHost: "" # RABBITMQ_PORT - rabbitmqPort: + rabbitmqPort: # RABBITMQ_USERNAME rabbitmqUsername: "" # FREELEAPS_DEVSVC_ENDPOINT @@ -114,7 +114,7 @@ chat: metricsEnabled: "false" # PROBES_ENABLED probesEnabled: "true" - + secrets: secretStoreRef: kind: FreeleapsSecretStore @@ -144,6 +144,10 @@ chat: remoteRef: key: "freeleaps-stripe-account-webhook-secret" type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: "freeleaps-stripe-subscription-webhook-secret" + type: Secret - key: rabbitmqPassword remoteRef: key: "freeleaps-rabbitmq-password" diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/deployment.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/deployment.yaml index f78af13d..13585e61 100644 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/deployment.yaml +++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/deployment.yaml @@ -50,7 +50,7 @@ spec: name: {{ $port.name }} protocol: {{ $port.protocol }} {{- end }} - {{- if .Values.freeleaps.resources }} + {{- if .Values.freeleaps.resources }} resources: {{- toYaml .Values.freeleaps.resources | nindent 12 }} {{- end }} @@ -106,7 +106,7 @@ spec: {{- end}} env: {{- range $key, $value := .Values.freeleaps.configs }} - {{- if not (or (eq $key "mongodbUri") (eq $key "jwtSecretKey") (eq $key "stripeApiKey") (eq $key "stripeWebhookSecret") (eq $key "stripeAccountWebhookSecret") (eq $key "rabbitmqPassword") (eq $key "redisUrl") (eq $key "giteaApiKey")) }} + {{- if not (or (eq $key "mongodbUri") (eq $key "jwtSecretKey") (eq $key "stripeApiKey") (eq $key "stripeWebhookSecret") (eq $key "stripeAccountWebhookSecret") (eq $key "stripeSubscriptionWebhookSecret") (eq $key "rabbitmqPassword") (eq $key "redisUrl") (eq $key "giteaApiKey")) }} - name: {{ $key | snakecase | upper }} valueFrom: secretKeyRef: diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index b568d80f..a83e9b89 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -112,6 +112,10 @@ freeleaps: remoteRef: key: freeleaps-alpha-stripe-account-webhook-secret type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: freeleaps-alpha-stripe-subscription-webhook-secret + type: Secret - key: rabbitmqPassword remoteRef: key: freeleaps-alpha-rabbitmq-password diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml index ff6246a4..71f45232 100644 --- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml @@ -103,6 +103,10 @@ freeleaps: remoteRef: key: freeleaps-prod-stripe-account-webhook-secret type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: freeleaps-prod-stripe-subscription-webhook-secret + type: Secret - key: rabbitmqPassword remoteRef: key: freeleaps-prod-rabbitmq-password diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml index 44ccf965..10c6d111 100644 --- a/freeleaps/helm-pkg/freeleaps/values.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.yaml @@ -70,7 +70,7 @@ freeleaps: # RABBITMQ_HOST rabbitmqHost: "" # RABBITMQ_PORT - rabbitmqPort: + rabbitmqPort: # RABBITMQ_USERNAME rabbitmqUsername: "" # FREELEAPS_DEVSVC_ENDPOINT @@ -141,6 +141,10 @@ freeleaps: remoteRef: key: "freeleaps-stripe-account-webhook-secret" type: Secret + - key: stripeSubscriptionWebhookSecret + remoteRef: + key: "freeleaps-stripe-subscription-webhook-secret" + type: Secret - key: rabbitmqPassword remoteRef: key: "freeleaps-rabbitmq-password"