Merge pull request #126 from trakrf/miks2u/tra-850-prod-image-gke-preprod

feat(banner): runtime ENVIRONMENT_LABEL passthrough (TRA-853)

Author: mikestankavich

argocd/root/templates/trakrf-backend.yaml

@@ -14,7 +14,10 @@
   image-updater annotations — they would be inert.
 */ -}}
 {{- range $env, $cfg := $.Values.envs }}
-{{- $base := printf "database:\n  name: trakrf\n  user: trakrf-app\n  credentialsSecret: trakrf-app-credentials\n  host: %s\nmigrate:\n  database: trakrf\n  user: trakrf-migrate\n  credentialsSecret: trakrf-migrate-credentials\n  host: %s\nconfig:\n  appEnv: %s\n" $cfg.dbHost $cfg.dbHost $env }}
+{{- $base := printf "database:\n  name: trakrf\n  user: trakrf-app\n  credentialsSecret: trakrf-app-credentials\n  host: %s\nmigrate:\n  database: trakrf\n  user: trakrf-migrate\n  credentialsSecret: trakrf-migrate-credentials\n  host: %s\nconfig:\n  appEnv: %s\n  environmentLabel: %q\n" $cfg.dbHost $cfg.dbHost $env $cfg.environmentLabel }}
+{{- if $cfg.imageTag }}
+{{- $base = printf "%simage:\n  tag: %q\n" $base $cfg.imageTag }}
+{{- end }}
 {{- $ingress := "ingress:\n  enabled: false\n" }}
 {{- if $cfg.ingressEnabled }}
 {{- $ingressCtx := dict

argocd/root/values.yaml

@@ -29,6 +29,18 @@ namespaces:
 #                                in its own namespace.
 # ingressEnabled               — gates the preview-style ingress + IPAllowList.
 # mqttIp                       — MQTT broker LB IP (Tofu-injected on GKE).
+# imageTag                     — trakrf-backend image tag override. Empty falls
+#                                back to chart default (helm/trakrf-backend/values-<cluster>.yaml).
+#                                On GKE preview that's intercepted by image-updater
+#                                to track `:preview`; prod pins an explicit tag
+#                                (the TRA-853 ServeSPA sha / floating `:prod` tag)
+#                                so no image-updater is needed. Empty until the
+#                                TRA-853 image is published.
+# environmentLabel             — frontend banner label (TRA-853). Backend reads
+#                                ENVIRONMENT_LABEL at serve time and stamps it into
+#                                index.html. Empty / "prod" / "production" → no
+#                                banner. Same main image everywhere; the banner is
+#                                purely this runtime value.
 # dbCluster.enabled            — false skips emitting the CNPG Cluster
 #                                Application entirely.
 # dbCluster.fullnameOverride   — drives CNPG Cluster name + Argo App name.
@@ -43,6 +55,8 @@ envs:
     dbHost: trakrf-db-preview-rw.trakrf-preview
     ingressEnabled: true
     mqttIp: ""
+    imageTag: ""
+    environmentLabel: preview
     dbCluster:
       enabled: true
       fullnameOverride: trakrf-db-preview
@@ -53,6 +67,11 @@ envs:
     dbHost: trakrf-db-prod-rw.trakrf-prod
     ingressEnabled: true
     mqttIp: ""
+    # Pinned to the first main image carrying the TRA-853 ServeSPA runtime-config
+    # injection (merge commit c372f81). Required for environmentLabel to render.
+    # Saturday's cutover may swap this for a floating :prod tag (TRA-375 call).
+    imageTag: sha-c372f81
+    environmentLabel: GKE pre-prod
     dbCluster:
       enabled: true
       fullnameOverride: trakrf-db-prod

helm/trakrf-backend/templates/configmap.yaml

@@ -6,6 +6,7 @@ metadata:
     {{- include "trakrf-backend.labels" . | nindent 4 }}
 data:
   APP_ENV: {{ .Values.config.appEnv | quote }}
+  ENVIRONMENT_LABEL: {{ .Values.config.environmentLabel | quote }}
   BACKEND_LOG_LEVEL: {{ .Values.config.logLevel | quote }}
   SERVICE_NAME: {{ .Values.config.serviceName | quote }}
   BACKEND_CORS_ORIGIN: {{ .Values.config.corsOrigin | quote }}

helm/trakrf-backend/values.yaml

@@ -111,6 +111,10 @@ config:
   serviceName: trakrf-backend
   corsOrigin: ""
   jwtExpirationSeconds: "3600"
+  # Display label for the frontend environment banner. The Go backend reads
+  # ENVIRONMENT_LABEL at serve time and stamps window.__APP_CONFIG__ into
+  # index.html (TRA-853). Empty / unset / "prod" / "production" → no banner.
+  environmentLabel: ""
 
 # Secrets. Values here land in a K8s Secret created by this chart.
 # For real deployments, override via values.secret.yaml (gitignored):