From 9cc03368efdb5c26f58738c47eb624226322a0db Mon Sep 17 00:00:00 2001
From: haardm <165951794+haardm@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:04:32 -0800
Subject: [PATCH] chore: Add 4 new HyperPod GA regions and fix region fallback
 logic

Fix for aws#359

Add support for 4 newly GA regions in health-monitoring-agent:
- ca-central-1 (YUL): ECR account 843976229209
- ap-southeast-3 (CGK): ECR account 971422672635
- ap-southeast-4 (MEL): ECR account 084375568333
- eu-south-2 (ZAZ): ECR account 626887787726

This brings total supported regions to 17 GA regions.

Fix fallback logic bug where unmapped regions would create
malformed image URIs. Previously, when a region was not in the mapping,
only the account ID would fallback to us-east-1 while the region
remained unchanged, resulting in invalid URIs like below:
  767398015722.dkr.ecr.ap-southeast-3.amazonaws.com/hyperpod-health-monitoring-agent:1.0.1038.0_1.0.305.0

Now both region AND account ID fallback together to us-east-1,
generating valid URIs:
  767398015722.dkr.ecr.us-east-1.amazonaws.com/...

This ensures the health-monitoring-agent can pull images even
when deployed in unmapped or future regions (if the cluster nodes have internet access).
---
 .../templates/_helpers.tpl                       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/helm_chart/HyperPodHelmChart/charts/health-monitoring-agent/templates/_helpers.tpl b/helm_chart/HyperPodHelmChart/charts/health-monitoring-agent/templates/_helpers.tpl
index ef2cea0a..13803bbd 100644
--- a/helm_chart/HyperPodHelmChart/charts/health-monitoring-agent/templates/_helpers.tpl
+++ b/helm_chart/HyperPodHelmChart/charts/health-monitoring-agent/templates/_helpers.tpl
@@ -149,15 +149,27 @@ Generate the health monitoring agent image URI based on AWS region
   "eu-north-1" "654654141839"
   "eu-west-1" "533267293120"
   "eu-west-2" "011528288831"
+  "eu-south-2" "626887787726"
   "ap-northeast-1" "533267052152"
   "ap-south-1" "011528288864"
   "ap-southeast-1" "905418428165"
   "ap-southeast-2" "851725636348"
+  "ap-southeast-3" "971422672635"
+  "ap-southeast-4" "084375568333"
+  "ca-central-1" "843976229209"
   "sa-east-1" "025066253954"
 -}}
 
-{{/* Get the account ID for the region, default to us-west-2 account if region not found */}}
-{{- $accountId := index $regionAccountMap $region | default "767398015722" -}}
+{{/* Get the account ID for the region, fallback to us-east-1 if region not found */}}
+{{- $accountId := index $regionAccountMap $region -}}
+{{- if not $accountId -}}
+  {{/* Region not in map - fallback both region and account to us-east-1 */}}
+  {{- $region = "us-east-1" -}}
+  {{- $accountId = "767398015722" -}}
+  {{- if .Values.debug -}}
+    {{/* DEBUG: Region not in mapping, falling back to us-east-1 */}}
+  {{- end -}}
+{{- end -}}
 
 {{/* Debug: Show final region and account mapping */}}
 {{- if .Values.debug -}}