From e37f51374bf3e62fb9dc81326489cd5029d05ffe Mon Sep 17 00:00:00 2001
From: Michael Pond <michael.pond@cds-snc.ca>
Date: Tue, 17 Dec 2024 08:43:59 -0500
Subject: [PATCH 1/2] Turning on helm for production

---
 helmfile/helmfile.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/helmfile/helmfile.yaml b/helmfile/helmfile.yaml
index 615dae36e..40b39b812 100644
--- a/helmfile/helmfile.yaml
+++ b/helmfile/helmfile.yaml
@@ -34,7 +34,7 @@ repositories:
   url: https://okgolove.github.io/helm-charts
 
 releases:
-{{ if or (eq .Environment.Name "dev") (eq .Environment.Name "staging") }}
+
   - name: notify-documentation
     namespace: notification-canada-ca
     labels:
@@ -90,8 +90,6 @@ releases:
     values:
     - ./overrides/notify/celery.yaml.gotmpl
 
-{{ end }}
-
   - name: k8s-event-logger
     namespace: amazon-cloudwatch
     labels:

From 35388c1dd1a19b8518ee79eef21431cb138ac2d1 Mon Sep 17 00:00:00 2001
From: Michael Pond <michael.pond@cds-snc.ca>
Date: Tue, 17 Dec 2024 15:46:45 -0500
Subject: [PATCH 2/2] fixing the new relic names to use environment variable
 names

---
 helmfile/overrides/notify/celery.yaml.gotmpl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/helmfile/overrides/notify/celery.yaml.gotmpl b/helmfile/overrides/notify/celery.yaml.gotmpl
index a8c8d1542..4f1d549a9 100644
--- a/helmfile/overrides/notify/celery.yaml.gotmpl
+++ b/helmfile/overrides/notify/celery.yaml.gotmpl
@@ -35,11 +35,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 +57,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 +73,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 +89,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 +112,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 +135,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 +158,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 }}"