From f454c4587cd79fda5ac8ad30fd9a65541f0f4636 Mon Sep 17 00:00:00 2001
From: Bradley Mclain <764990+BradMclain@users.noreply.github.com>
Date: Thu, 28 May 2026 14:45:54 +1000
Subject: [PATCH 1/2] fix(helm): remove trailing colon from
 OTEL_RESOURCE_ATTRIBUTES env var name

---
 charts/gitops/templates/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitops/templates/deployment.yml b/charts/gitops/templates/deployment.yml
index 2e90073..e46640d 100644
--- a/charts/gitops/templates/deployment.yml
+++ b/charts/gitops/templates/deployment.yml
@@ -90,7 +90,7 @@ spec:
             value: "gitops"
           - name: OTEL_EXPORTER_OTLP_TIMEOUT
             value: "1"
-          - name: OTEL_RESOURCE_ATTRIBUTES: 
+          - name: OTEL_RESOURCE_ATTRIBUTES
             value: "cluster={{.Values.cluster}}"
           # We want to limit the length of the attributes so that we don't store too much
           - name: OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT

From 2184d7040c36b802af7c86a1b6c074c92940b269 Mon Sep 17 00:00:00 2001
From: Bradley Mclain <764990+BradMclain@users.noreply.github.com>
Date: Thu, 28 May 2026 15:18:39 +1000
Subject: [PATCH 2/2] fix(helm): use correct values reference for
 OTEL_RESOURCE_ATTRIBUTES cluster name

---
 charts/gitops/templates/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitops/templates/deployment.yml b/charts/gitops/templates/deployment.yml
index e46640d..dcd1387 100644
--- a/charts/gitops/templates/deployment.yml
+++ b/charts/gitops/templates/deployment.yml
@@ -91,7 +91,7 @@ spec:
           - name: OTEL_EXPORTER_OTLP_TIMEOUT
             value: "1"
           - name: OTEL_RESOURCE_ATTRIBUTES
-            value: "cluster={{.Values.cluster}}"
+            value: "cluster={{.Values.environment.CLUSTER_NAME}}"
           # We want to limit the length of the attributes so that we don't store too much
           - name: OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT
             value: "512"