From 4fd86f444d0dca5d7a9445a4bdee728177f82141 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 23 Apr 2026 10:45:59 +0100
Subject: [PATCH 1/3] Adjust indentation for brokerSelectorLabels in emqx.yaml

---
 helm/flowfuse/templates/emqx.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/flowfuse/templates/emqx.yaml b/helm/flowfuse/templates/emqx.yaml
index 83f8e9e4..726b0dcd 100644
--- a/helm/flowfuse/templates/emqx.yaml
+++ b/helm/flowfuse/templates/emqx.yaml
@@ -101,7 +101,7 @@ kind: Ingress
 metadata:
     name: flowforge-broker
     labels:
-      {{- include "forge.brokerSelectorLabels" . | nindent 4 }}
+      {{- include "forge.brokerSelectorLabels" . | nindent 8 }}
     annotations:
     {{- if .Values.ingress.certManagerIssuer }}
         cert-manager.io/cluster-issuer: {{ .Values.ingress.certManagerIssuer }}
@@ -132,4 +132,4 @@ spec:
         secretName: {{ include "forge.brokerDomain" . }}
   {{- end }}
 
-{{- end }}
\ No newline at end of file
+{{- end }}

From f2ee738638ccb10497ce6b9e71e69c5bec2b907c Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 23 Apr 2026 11:03:15 +0100
Subject: [PATCH 2/3] Refactor broker URL assignment in configmap.yaml

Removed conditional URL assignment for broker.
---
 helm/flowfuse/templates/configmap.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/helm/flowfuse/templates/configmap.yaml b/helm/flowfuse/templates/configmap.yaml
index a14907de..d7a6bf48 100644
--- a/helm/flowfuse/templates/configmap.yaml
+++ b/helm/flowfuse/templates/configmap.yaml
@@ -209,11 +209,7 @@ data:
       {{ if .Values.forge.broker.url -}}
       url: {{ .Values.forge.broker.url }}
       {{ else -}}
-      {{ if .Values.forge.broker.teamBroker.enabled }}
-      url: mqtt://emqx-listeners.{{ .Release.Namespace }}:1883
-      {{ else -}}
       url: mqtt://flowforge-broker.{{ .Release.Namespace }}:1883
-      {{end -}}
       {{ end -}}
       {{ if .Values.forge.broker.public_url -}}
       public_url: {{ .Values.forge.broker.public_url }}

From ddafb49c5fcb6ec5ab01e19a70fd4b02680a774c Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 23 Apr 2026 11:58:07 +0100
Subject: [PATCH 3/3] revert removal

---
 helm/flowfuse/templates/configmap.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helm/flowfuse/templates/configmap.yaml b/helm/flowfuse/templates/configmap.yaml
index d7a6bf48..a14907de 100644
--- a/helm/flowfuse/templates/configmap.yaml
+++ b/helm/flowfuse/templates/configmap.yaml
@@ -209,7 +209,11 @@ data:
       {{ if .Values.forge.broker.url -}}
       url: {{ .Values.forge.broker.url }}
       {{ else -}}
+      {{ if .Values.forge.broker.teamBroker.enabled }}
+      url: mqtt://emqx-listeners.{{ .Release.Namespace }}:1883
+      {{ else -}}
       url: mqtt://flowforge-broker.{{ .Release.Namespace }}:1883
+      {{end -}}
       {{ end -}}
       {{ if .Values.forge.broker.public_url -}}
       public_url: {{ .Values.forge.broker.public_url }}