Merge branch 'main' into xmas-code-freeze-workflow

P0NDER0SA · web-flow · commit 769f1eddecfa · 2025-12-02T11:34:03.000-05:00
diff --git a/.github/workflows/helmfile_production_apply.yaml b/.github/workflows/helmfile_production_apply.yaml
@@ -14,7 +14,7 @@ env:
   PRODUCTION_AWS_ACCOUNT: ${{ secrets.PRODUCTION_AWS_ACCOUNT_ID }}
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PRODUCTION }}
   PRIVATE_ECR: ${{ secrets.PRODUCTION_AWS_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/notify
-  API_LAMBDA_IMAGE: api-lambda:7962f58
+  API_LAMBDA_IMAGE: api-lambda:b462df1
   HEARTBEAT_IMAGE: heartbeat:5b4e19c
   SYSTEM_STATUS_IMAGE: system_status:5b4e19c
   SES_TO_SQS_EMAIL_CALLBACKS_IMAGE: ses_to_sqs_email_callbacks:5b4e19c
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.20.666
+v2.20.672
diff --git a/helmfile/overrides/production.env b/helmfile/overrides/production.env
@@ -1,5 +1,5 @@
-ADMIN_DOCKER_TAG: "e541d98"
-API_DOCKER_TAG: "7962f58"
+ADMIN_DOCKER_TAG: "c1f045b"
+API_DOCKER_TAG: "b462df1"
 DOCUMENT_DOWNLOAD_DOCKER_TAG: "ee47838"
 DOCUMENTATION_DOCKER_TAG: "618118d"
 API_HOST_NAME_PREFIX: "api"
diff --git a/helmfile/overrides/system/velero.yaml.gotmpl b/helmfile/overrides/system/velero.yaml.gotmpl
@@ -36,7 +36,7 @@ serviceAccount:
   server:
     create: true
     annotations:
-      eks.amazonaws.com/role-arn: arn:aws:iam::{{ requiredEnv "AWS_ACCOUNT_ID"}}:role/notification-canada-ca-dev-eks-cluster-velero-role
+      eks.amazonaws.com/role-arn: arn:aws:iam::{{ requiredEnv "AWS_ACCOUNT_ID"}}:role/notification-canada-ca-{{ .Environment.Name }}-eks-cluster-velero-role
 
 credentials:
   useSecret: false
