From 2730b03e701922c3b14fdd5f8e8dfb64223b3edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Goinvic?= <gaelg@element.io>
Date: Fri, 7 Mar 2025 15:13:58 +0100
Subject: [PATCH] fix(synapse): Use synapse-guest-module by Element (supplier)

---
 .../environments/default/charts.yaml.gotmpl   | 12 ++++++------
 .../environments/default/images.yaml.gotmpl   | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index c1a9594e..8aac359a 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -109,7 +109,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-element"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   elementWellKnown:
     # providerCategory: "Platform"
@@ -119,7 +119,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-well-known"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   home:
     # providerCategory: "Platform"
@@ -211,7 +211,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-matrix-user-verification-service"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   memcached:
     # providerCategory: "Community"
@@ -449,7 +449,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   synapseAdmin:
     # Enterprise Component
@@ -477,7 +477,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-create-account"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   synapseGroupsync:
     # Enterprise Component
@@ -505,7 +505,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-web"
-    version: "6.1.0"
+    version: "6.1.2"
     verify: true
   xwiki:
     # providerCategory: "Supplier"
diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl
index 636bc0df..cb00e921 100644
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -79,12 +79,13 @@ images:
     tag: "2.3.21@sha256:c76965a84d1ca527f523404eb027119f6736b199c094e4671037cb345ecad3dc"
   element:
     # providerCategory: "Supplier"
-    # providerResponsible: "Nordeck"
-    # upstreamRegistry: "https://registry.opencode.de"
-    # upstreamRepository: "bmi/opendesk/components/supplier/nordeck/images/opendesk-element-web"
+    # providerResponsible: "Element"
+    # upstreamRegistry: "https://ghcr.io"
+    # upstreamRepository: "element-hq/element-web-modules/opendesk-plugin"
+    # upstreamMirrorTagFilterRegEx: '^latest-\d+$'
     registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/nordeck/images/opendesk-element-web"
-    tag: "1.11.7@sha256:c5881cea86a721252e724000e4ed870cae66f9b3eabc45074e1f43b1818423bc"
+    repository: "bmi/opendesk/components/supplier/element/images-mirror/opendesk-plugin"
+    tag: "latest-250304@sha256:b997a9245c5a85ddb9935e6a9f8f8da60fed58aad17df8f1e1e2fabafdbf0dd1"
   elementAdminBot:
     # Enterprise Component
     # providerCategory: "Supplier"
@@ -927,14 +928,14 @@ images:
     tag: "1.32.0@sha256:6d49f7f37ae5f4c07bfe46edb44e3d3b6896974d1b87da76d8aa8d6e23b4d619"
   synapseGuestModule:
     # providerCategory: "Supplier"
-    # providerResponsible: "Nordeck"
+    # providerResponsible: "Element"
     # upstreamRegistry: "https://ghcr.io"
-    # upstreamRepository: "nordeck/synapse-guest-module"
+    # upstreamRepository: "element-hq/synapse-guest-module"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["1", "0", "0"]
     registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/synapse-guest-module"
-    tag: "2.0.0@sha256:0fb4ee93cf6fc58f3f3b2f7f8c95d5e6d259b9a5dc354bde516e441187819283"
+    repository: "bmi/opendesk/components/supplier/element/images-mirror/synapse-guest-module"
+    tag: "1.0.1@sha256:a8c02b2eb4dfea9632b32d00415af8d5276870fa150fac392914f67053c161ea"
   synapseWeb:
     # providerCategory: "Community"
     # providerResponsible: "Element"