From 4d295811b558ecfe0d95f6d4cf3d4dd94ff47f95 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 27 May 2026 11:36:29 +0200 Subject: [PATCH 01/12] Fake change to force clean pre-staging deployment --- forge/forge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/forge.js b/forge/forge.js index 3f7b5bbfc2..44cf3b4134 100644 --- a/forge/forge.js +++ b/forge/forge.js @@ -483,7 +483,7 @@ module.exports = async (options = {}) => { try { await server.close() } catch (err2) { - server.log.error(`Failed to shutdown: ${err2.toString()}`) + server.log.error(`ERROR: Failed to shutdown: ${err2.toString()}`) server.log.error(err2.stack) } throw err From 9f88bea7b4835f174b58f6004ba8cf21f1ff17b6 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 27 May 2026 11:50:58 +0200 Subject: [PATCH 02/12] Update helm release using feature branch --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 88f5eb85d8..960ac30699 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'main' + ref: 'remove-cluster-rollbinding' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From b22e5916e835720fef750963628bdc72719b9954 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Fri, 29 May 2026 12:30:42 +0200 Subject: [PATCH 03/12] Deploy valkey --- ci/ci-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci-values.yaml b/ci/ci-values.yaml index fa78a9dc74..c92e7c29b8 100644 --- a/ci/ci-values.yaml +++ b/ci/ci-values.yaml @@ -2,7 +2,7 @@ forge: domain: flowfuse.dev https: true localPostgresql: true - localValkey: false + localValkey: true projectIngressClassName: traefik broker: enabled: true From 71c475b0da9719cea6e04cf3f4a93bcedba3b5c1 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Fri, 29 May 2026 12:31:02 +0200 Subject: [PATCH 04/12] Rever to main helm branch --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 960ac30699..88f5eb85d8 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'remove-cluster-rollbinding' + ref: 'main' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From 158a6bf6b1e2360ebe5f25d0a16e044a45f66d76 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Fri, 29 May 2026 13:27:47 +0200 Subject: [PATCH 05/12] Use helm chart from `chore-valkey-switch` branch --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 88f5eb85d8..3801a21046 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'main' + ref: 'chore-valkey-switch' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From d2a6cd3f868c9cbfcedd3910f16eca2131e31061 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Fri, 29 May 2026 13:55:49 +0200 Subject: [PATCH 06/12] Back to main and no valkey --- .github/workflows/branch-deploy.yaml | 2 +- ci/ci-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 3801a21046..88f5eb85d8 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'chore-valkey-switch' + ref: 'main' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} diff --git a/ci/ci-values.yaml b/ci/ci-values.yaml index c92e7c29b8..fa78a9dc74 100644 --- a/ci/ci-values.yaml +++ b/ci/ci-values.yaml @@ -2,7 +2,7 @@ forge: domain: flowfuse.dev https: true localPostgresql: true - localValkey: true + localValkey: false projectIngressClassName: traefik broker: enabled: true From e4f7985b527645ba355bebbc4be6ddcd462823b6 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 2 Jun 2026 18:39:56 +0200 Subject: [PATCH 07/12] Test mosquitto removal --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 88f5eb85d8..d91ba7cb8a 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'main' + ref: 'feat-emqx-default-broker' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From 68b0e7722feaabcc8b7f9c2c2433f6d8b4380603 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 2 Jun 2026 18:50:57 +0200 Subject: [PATCH 08/12] Fully enable Team Broker feature --- ci/ci-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ci-values.yaml b/ci/ci-values.yaml index fa78a9dc74..1734d7548c 100644 --- a/ci/ci-values.yaml +++ b/ci/ci-values.yaml @@ -7,7 +7,7 @@ forge: broker: enabled: true teamBroker: - uiOnly: true + enabled: true cloudProvider: aws cache: type: memory From 01e7c75603e1a2381b416fc636ba03d1f62a19b6 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 3 Jun 2026 07:48:02 +0200 Subject: [PATCH 09/12] Deploy fresh env --- .github/workflows/branch-deploy.yaml | 2 +- ci/ci-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index d91ba7cb8a..88f5eb85d8 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'feat-emqx-default-broker' + ref: 'main' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} diff --git a/ci/ci-values.yaml b/ci/ci-values.yaml index 1734d7548c..22a7a1bb61 100644 --- a/ci/ci-values.yaml +++ b/ci/ci-values.yaml @@ -7,7 +7,7 @@ forge: broker: enabled: true teamBroker: - enabled: true + enabled: false cloudProvider: aws cache: type: memory From 4fcdb28bb8623029001e40db75a9e265d32a1b70 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 3 Jun 2026 11:32:22 +0200 Subject: [PATCH 10/12] Drop in broker replacemen run --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 88f5eb85d8..d91ba7cb8a 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'main' + ref: 'feat-emqx-default-broker' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From d0849d79f90e1d750b41107843dc885b314e11cf Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 3 Jun 2026 14:16:03 +0200 Subject: [PATCH 11/12] Clean pre-staging env --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index d91ba7cb8a..88f5eb85d8 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'feat-emqx-default-broker' + ref: 'main' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }} From bb161203daa32d624bd69ea5f91b5ac0d720dcb7 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 3 Jun 2026 15:00:24 +0200 Subject: [PATCH 12/12] Deploy emqx --- .github/workflows/branch-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml index 88f5eb85d8..d91ba7cb8a 100644 --- a/.github/workflows/branch-deploy.yaml +++ b/.github/workflows/branch-deploy.yaml @@ -478,7 +478,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: 'FlowFuse/helm' - ref: 'main' + ref: 'feat-emqx-default-broker' path: 'helm-repo' token: ${{ secrets.GITHUB_TOKEN }}