From 3903a75cbb32d12d6cefafdb604a13281972359b Mon Sep 17 00:00:00 2001 From: Denys Pohrebniak Date: Wed, 9 Apr 2025 13:17:30 +0300 Subject: [PATCH] SDP-1596 add new broker type scheduler and deprecate enable scheduler config --- charts/stellar-disbursement-platform/Chart.yaml | 5 +++-- charts/stellar-disbursement-platform/README.md | 3 +-- charts/stellar-disbursement-platform/minimal-values.yaml | 6 ++---- charts/stellar-disbursement-platform/values.yaml | 6 ++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/charts/stellar-disbursement-platform/Chart.yaml b/charts/stellar-disbursement-platform/Chart.yaml index 89ed79d..8247b28 100644 --- a/charts/stellar-disbursement-platform/Chart.yaml +++ b/charts/stellar-disbursement-platform/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: stellar-disbursement-platform description: A Helm chart for the Stellar Disbursement Platform Backend (A.K.A. `sdp`) -version: "3.6.3" -appVersion: "3.6.1" +version: "3.7.0" +appVersion: "3.7.0" type: application maintainers: - name: Stellar Development Foundation @@ -10,3 +10,4 @@ sources: - https://github.com/stellar/stellar-disbursement-platform-backend - https://github.com/stellar/stellar-disbursement-platform-frontend - https://github.com/stellar/helm-charts + \ No newline at end of file diff --git a/charts/stellar-disbursement-platform/README.md b/charts/stellar-disbursement-platform/README.md index ebaff06..91e9c50 100644 --- a/charts/stellar-disbursement-platform/README.md +++ b/charts/stellar-disbursement-platform/README.md @@ -86,7 +86,7 @@ These parameters are shared by all charts. | `global.deployment.topologySpreadConstraints` | Pod topology spread constraints for all services. | `[]` | | `global.ephemeralDatabase` | Enables or disables the creation of an ephemeral database for testing purposes. | `true` | | `global.eventBroker` | Configuration related to the event broker used by the application. | | -| `global.eventBroker.type` | The type of event broker to be used. Options: "NONE", "KAFKA". Default: "KAFKA". | `KAFKA` | +| `global.eventBroker.type` | The type of event broker to be used. Options: "SCHEDULER", "KAFKA". Default: "SCHEDULER". | `SCHEDULER` | | `global.eventBroker.urls` | A comma-separated list of broker URLs for the event broker. | `nil` | | `global.eventBroker.consumerGroupId` | The consumer group ID for the event broker. | `nil` | | `global.eventBroker.kafka` | Configuration related to the Kafka event broker. | | @@ -141,7 +141,6 @@ Configuration parameters for the SDP Core Service which is the core backend serv | `sdp.configMap.data.DISABLE_MFA` | Determines if email-based MFA should be disabled during login ("true" or "false"). | `false` | | `sdp.configMap.data.SDP_UI_BASE_URL` | The base URL of the SDP UI/dashboard. | `nil` | | `sdp.configMap.data.INSTANCE_NAME` | The name of the SDP instance. Example: "SDP Testnet". | `nil` | -| `sdp.configMap.data.ENABLE_SCHEDULER` | Whether the scheduled jobs are enabled in this instance ("true" or "false"). Default "false". | `false` | | `sdp.configMap.data.SCHEDULER_PAYMENT_JOB_SECONDS` | The interval in seconds for the payment job that syncs payments between the SDP and the TSS. | `10` | | `sdp.configMap.data.SCHEDULER_RECEIVER_INVITATION_JOB_SECONDS` | The interval in seconds for the receiver invitation job that sends invitations to new receivers. 0 or negative values disable the job. | `10` | | `sdp.configMap.data.MAX_INVITATION_RESEND_ATTEMPTS` | The maximum number of times an invitation can be resent. 0 or negative values disable the job. | `3` | diff --git a/charts/stellar-disbursement-platform/minimal-values.yaml b/charts/stellar-disbursement-platform/minimal-values.yaml index 00aaa46..a67263c 100644 --- a/charts/stellar-disbursement-platform/minimal-values.yaml +++ b/charts/stellar-disbursement-platform/minimal-values.yaml @@ -6,11 +6,11 @@ global: ## @extra global.eventBroker Configuration related to the event broker used by the application. - ## @param global.eventBroker.type The type of event broker to be used. Options: "NONE", "KAFKA". Default: "KAFKA". + ## @param global.eventBroker.type The type of event broker to be used. Options: "KAFKA", "SCHEDULER". Default: "SCHEDULER". ## @param global.eventBroker.urls A comma-separated list of broker URLs for the event broker. ## @param global.eventBroker.consumerGroupId The consumer group ID for the event broker. eventBroker: - type: "NONE" + type: "SCHEDULER" sdp: @@ -20,7 +20,6 @@ sdp: domain: #required mtnDomain: #required - ## @param sdp.configMap.data.ENABLE_SCHEDULER Whether the scheduled jobs are enabled in this instance ("true" or "false"). Setting to "true" because broker type is `NONE`. ## @param sdp.configMap.data.SEP10_SIGNING_PUBLIC_KEY Anchor platform SEP10 signing public key. ## @param sdp.configMap.data.DISTRIBUTION_PUBLIC_KEY The public key of the Stellar distribution account that sends the Stellar payments. ## @param sdp.configMap.data.RECAPTCHA_SITE_KEY Site key for ReCaptcha. Required if using ReCaptcha. @@ -28,7 +27,6 @@ sdp: configMap: annotations: data: - ENABLE_SCHEDULER: "true" SEP10_SIGNING_PUBLIC_KEY: #required DISTRIBUTION_PUBLIC_KEY: #required RECAPTCHA_SITE_KEY: #required diff --git a/charts/stellar-disbursement-platform/values.yaml b/charts/stellar-disbursement-platform/values.yaml index d359462..de80a19 100644 --- a/charts/stellar-disbursement-platform/values.yaml +++ b/charts/stellar-disbursement-platform/values.yaml @@ -77,11 +77,11 @@ global: ephemeralDatabase: true ## @extra global.eventBroker Configuration related to the event broker used by the application. - ## @param global.eventBroker.type The type of event broker to be used. Options: "NONE", "KAFKA". Default: "KAFKA". + ## @param global.eventBroker.type The type of event broker to be used. Options: "KAFKA", "SCHEDULER". Default: "SCHEDULER". ## @param global.eventBroker.urls A comma-separated list of broker URLs for the event broker. ## @param global.eventBroker.consumerGroupId The consumer group ID for the event broker. eventBroker: - type: "KAFKA" + type: "SCHEDULER" urls: #required consumerGroupId: #required @@ -166,7 +166,6 @@ sdp: ## @param sdp.configMap.data.DISABLE_MFA Determines if email-based MFA should be disabled during login ("true" or "false"). ## @param sdp.configMap.data.SDP_UI_BASE_URL The base URL of the SDP UI/dashboard. ## @param sdp.configMap.data.INSTANCE_NAME The name of the SDP instance. Example: "SDP Testnet". - ## @param sdp.configMap.data.ENABLE_SCHEDULER Whether the scheduled jobs are enabled in this instance ("true" or "false"). Default "false". ## @param sdp.configMap.data.SCHEDULER_PAYMENT_JOB_SECONDS The interval in seconds for the payment job that syncs payments between the SDP and the TSS. ## @param sdp.configMap.data.SCHEDULER_RECEIVER_INVITATION_JOB_SECONDS The interval in seconds for the receiver invitation job that sends invitations to new receivers. 0 or negative values disable the job. ## @param sdp.configMap.data.MAX_INVITATION_RESEND_ATTEMPTS The maximum number of times an invitation can be resent. 0 or negative values disable the job. @@ -189,7 +188,6 @@ sdp: DISABLE_RECAPTCHA: "false" DISABLE_MFA: "false" INSTANCE_NAME: #required - ENABLE_SCHEDULER: "false" SCHEDULER_PAYMENT_JOB_SECONDS: "10" SCHEDULER_RECEIVER_INVITATION_JOB_SECONDS: "10" MAX_INVITATION_RESEND_ATTEMPTS: "3"