From 3bfff02b64877acd5c8482779125d7b16990abb5 Mon Sep 17 00:00:00 2001 From: Mike Pond <32133001+P0NDER0SA@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:11:53 -0500 Subject: [PATCH] Staging Helm Fixes (Celery Vars) (#3215) * Pushing missing vars for celery and a small fix for new relic names * adding dummies for dev --- helmfile/charts/notify-celery/values.yaml | 4 ++++ helmfile/overrides/dev.env | 5 ++++- helmfile/overrides/notify/celery.yaml.gotmpl | 11 +++++++++++ helmfile/overrides/production.env | 5 ++++- helmfile/overrides/staging.env | 5 ++++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/helmfile/charts/notify-celery/values.yaml b/helmfile/charts/notify-celery/values.yaml index 6aa3ca68a..0b2aba4f2 100644 --- a/helmfile/charts/notify-celery/values.yaml +++ b/helmfile/charts/notify-celery/values.yaml @@ -28,6 +28,10 @@ celeryCommon: CELERY_CONCURRENCY: "4" FF_CLOUDWATCH_METRICS_ENABLED: "True" FF_ANNUAL_LIMIT: false + CELERY_DELIVER_SMS_RATE_LIMIT: "10/s" + AWS_PINPOINT_SC_POOL_ID: "" + AWS_PINPOINT_SC_TEMPLATE_IDS: "" + AWS_PINPOINT_DEFAULT_POOL_ID: "" celerySecrets: #SECRET_NAME_FOR_ENV_PASSED_TO_CONTAINER: SECRET_NAME_READ_FROM_AWS_SECRETS_MANAGER diff --git a/helmfile/overrides/dev.env b/helmfile/overrides/dev.env index 594091c54..5fd8c15d8 100644 --- a/helmfile/overrides/dev.env +++ b/helmfile/overrides/dev.env @@ -18,4 +18,7 @@ AWS_XRAY_CONTEXT_MISSING: "LOG_WARNING" EXTRA_MIME_TYPES: "b7b2104c-011f-436a-a25f-3fd66b6591e4:application/octet-stream,b7b2104c-011f-436a-a25f-3fd66b6591e4:application/xml,b7b2104c-011f-436a-a25f-3fd66b6591e4:text/xml,b7b2104c-011f-436a-a25f-3fd66b6591e4:application/json" DEBUG: "False" FF_ANNUAL_LIMIT: "true" -SALESFORCE_DOMAIN: "test" \ No newline at end of file +SALESFORCE_DOMAIN: "test" +AWS_PINPOINT_SC_POOL_ID: "" +AWS_PINPOINT_SC_TEMPLATE_IDS: "" +AWS_PINPOINT_DEFAULT_POOL_ID: "" \ No newline at end of file diff --git a/helmfile/overrides/notify/celery.yaml.gotmpl b/helmfile/overrides/notify/celery.yaml.gotmpl index a8c8d1542..ed46340c5 100644 --- a/helmfile/overrides/notify/celery.yaml.gotmpl +++ b/helmfile/overrides/notify/celery.yaml.gotmpl @@ -21,6 +21,9 @@ celeryCommon: AWS_XRAY_SDK_ENABLED: {{ .StateValues.AWS_XRAY_SDK_ENABLED }} ASSET_DOMAIN: "https://assets.{{ requiredEnv "BASE_DOMAIN" }}" FF_ANNUAL_LIMIT: "{{ .StateValues.FF_ANNUAL_LIMIT }}" + AWS_PINPOINT_SC_POOL_ID: "{{ .StateValues.AWS_PINPOINT_SC_POOL_ID }}" + AWS_PINPOINT_SC_TEMPLATE_IDS: "{{ .StateValues.AWS_PINPOINT_SC_TEMPLATE_IDS }}" + AWS_PINPOINT_DEFAULT_POOL_ID: "{{ .StateValues.AWS_PINPOINT_DEFAULT_POOL_ID }}" image: tag: {{ env "{{ .StateValues.DOCKER_TAG }}" | default "latest" }} @@ -35,11 +38,13 @@ nodes: deploymentBeatEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} terminationGracePeriodSeconds: {{ if eq .Environment.Name "production" }} 60 {{ else if eq .Environment.Name "staging" }} 60 {{ else }} 60 {{ end }} replicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 3 {{ else }} 3 {{ end }} + newRelicAppName: "notification-celery-sms-{{ .Environment.Name }}" other-beat: deployment: deploymentBeatEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} terminationGracePeriodSeconds: {{ if eq .Environment.Name "production" }} 30 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} replicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 3 {{ else }} 3 {{ end }} + newRelicAppName: "notification-celery-beat-{{ .Environment.Name }}" primary-main: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -55,6 +60,7 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-main-primary-{{ .Environment.Name }}" primary-email: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -70,6 +76,7 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-email-send-primary-{{ .Environment.Name }}" primary-sms: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -85,6 +92,7 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-sms-send-primary-{{ .Environment.Name }}" scalable-main: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -107,6 +115,7 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-main-scalable-{{ .Environment.Name }}" scalable-email: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -129,6 +138,7 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-email-send-scalable-{{ .Environment.Name }}" scalable-sms: deployment: deploymentEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} @@ -151,3 +161,4 @@ nodes: pdb: pdbEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minAvailable: {{ if eq .Environment.Name "production" }} 2 {{ else if eq .Environment.Name "staging" }} 2 {{ else }} 2 {{ end }} + newRelicAppName: "notification-celery-sms-send-scalable-{{ .Environment.Name }}" diff --git a/helmfile/overrides/production.env b/helmfile/overrides/production.env index ca625b7f8..1d6db2c9c 100644 --- a/helmfile/overrides/production.env +++ b/helmfile/overrides/production.env @@ -18,4 +18,7 @@ AWS_XRAY_CONTEXT_MISSING: "LOG_WARNING" EXTRA_MIME_TYPES: "2827d182-8533-4c11-ae95-2ee6e8c8f810:application/octet-stream,441b98a5-718e-483a-a5df-da5855899ec9:application/xml,441b98a5-718e-483a-a5df-da5855899ec9:text/xml,441b98a5-718e-483a-a5df-da5855899ec9:application/json,a7ef2e53-42ab-4b16-9a5b-e623fb778074:application/xml,a7ef2e53-42ab-4b16-9a5b-e623fb778074:text/xml,35e7f358-2683-44b9-8027-c984e1d018d8:application/json,7dfdf745-2472-4d09-8523-9ac72db81ef2:application/json,7dfdf745-2472-4d09-8523-9ac72db81ef2:image/svg+xml,35e7f358-2683-44b9-8027-c984e1d018d8:image/svg+xml" DEBUG: "false" FF_ANNUAL_LIMIT: "false" -SALESFORCE_DOMAIN: "login" \ No newline at end of file +SALESFORCE_DOMAIN: "login" +AWS_PINPOINT_DEFAULT_POOL_ID: "pool-1240066b32d34ce896fc233a9c1c02fe" +AWS_PINPOINT_SC_POOL_ID: "pool-fc615fba44554e54b1cc8aae9d2261aa" +AWS_PINPOINT_SC_TEMPLATE_IDS: "afeac4c1-1763-4da5-a00c-1cb266188488" \ No newline at end of file diff --git a/helmfile/overrides/staging.env b/helmfile/overrides/staging.env index d38a8f89d..e18b0ce9a 100644 --- a/helmfile/overrides/staging.env +++ b/helmfile/overrides/staging.env @@ -18,4 +18,7 @@ AWS_XRAY_CONTEXT_MISSING: "LOG_WARNING" EXTRA_MIME_TYPES: "b7b2104c-011f-436a-a25f-3fd66b6591e4:application/octet-stream,b7b2104c-011f-436a-a25f-3fd66b6591e4:application/xml,b7b2104c-011f-436a-a25f-3fd66b6591e4:text/xml,b7b2104c-011f-436a-a25f-3fd66b6591e4:application/json,dea2d718-b7fb-4003-868a-1832fd025d7a:image/svg+xml" DEBUG: "false" FF_ANNUAL_LIMIT: "true" -SALESFORCE_DOMAIN: "test" \ No newline at end of file +SALESFORCE_DOMAIN: "test" +AWS_PINPOINT_SC_POOL_ID: "pool-b20333ce1e4e49309ba1db3bf94a3f57" +AWS_PINPOINT_SC_TEMPLATE_IDS: "b06cb566-6b8c-4558-b5a5-cfeca0c8f962" +AWS_PINPOINT_DEFAULT_POOL_ID: "pool-8885654b47d6466f9aaee14c62494ff2" \ No newline at end of file