From 27e74bfd0840d4529f594b66928422763850f283 Mon Sep 17 00:00:00 2001
From: Jesse Simpson <jesse.simpson@camunda.com>
Date: Tue, 13 Aug 2024 11:35:31 -0400
Subject: [PATCH] fix(8.5): revert "dropped namespace from zeebe advertisedHost
 and initialContactPoints" (#2217)

---
 .../templates/zeebe/statefulset.yaml                      | 4 ++--
 .../test/unit/zeebe/golden/statefulset.golden.yaml        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml b/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
index 5b74fe0735..2e5a5536e7 100644
--- a/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
+++ b/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
@@ -64,11 +64,11 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: ZEEBE_BROKER_NETWORK_ADVERTISEDHOST
-              value: "$(K8S_NAME).$(K8S_SERVICE_NAME)"
+              value: "$(K8S_NAME).$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc"
             - name: ZEEBE_BROKER_CLUSTER_INITIALCONTACTPOINTS
               value:
               {{- range (untilStep 0 (int .Values.zeebe.clusterSize) 1) }}
-                $(K8S_SERVICE_NAME)-{{ . }}.$(K8S_SERVICE_NAME):{{$.Values.zeebe.service.internalPort}},
+                $(K8S_SERVICE_NAME)-{{ . }}.$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc:{{$.Values.zeebe.service.internalPort}},
               {{- end }}
             - name: ZEEBE_LOG_LEVEL
               value: {{ .Values.zeebe.logLevel | quote }}
diff --git a/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
index 52e1ea3703..afe9e485a0 100644
--- a/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -69,12 +69,12 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: ZEEBE_BROKER_NETWORK_ADVERTISEDHOST
-              value: "$(K8S_NAME).$(K8S_SERVICE_NAME)"
+              value: "$(K8S_NAME).$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc"
             - name: ZEEBE_BROKER_CLUSTER_INITIALCONTACTPOINTS
               value:
-                $(K8S_SERVICE_NAME)-0.$(K8S_SERVICE_NAME):26502,
-                $(K8S_SERVICE_NAME)-1.$(K8S_SERVICE_NAME):26502,
-                $(K8S_SERVICE_NAME)-2.$(K8S_SERVICE_NAME):26502,
+                $(K8S_SERVICE_NAME)-0.$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc:26502,
+                $(K8S_SERVICE_NAME)-1.$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc:26502,
+                $(K8S_SERVICE_NAME)-2.$(K8S_SERVICE_NAME).$(K8S_NAMESPACE).svc:26502,
             - name: ZEEBE_LOG_LEVEL
               value: "info"
             - name: ZEEBE_BROKER_GATEWAY_ENABLE