From a8bbc84740f4f3600d6b1aca578aec134f9dbfe2 Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Sun, 26 May 2024 15:28:21 -0500
Subject: [PATCH] remove registration

---
 charts/mautrix-discord/Chart.yaml             |  2 +-
 charts/mautrix-discord/templates/_helpers.tpl | 31 -------------------
 .../mautrix-discord/templates/deployment.yaml |  7 -----
 charts/mautrix-discord/values.yaml            |  6 ----
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/charts/mautrix-discord/Chart.yaml b/charts/mautrix-discord/Chart.yaml
index b0825bd..576909d 100644
--- a/charts/mautrix-discord/Chart.yaml
+++ b/charts/mautrix-discord/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mautrix-discord
-version: 0.0.2
+version: 0.1.0
 description: Chart for Matrix Discord Bridge
 keywords:
   - matrix
diff --git a/charts/mautrix-discord/templates/_helpers.tpl b/charts/mautrix-discord/templates/_helpers.tpl
index 36ac707..1273920 100644
--- a/charts/mautrix-discord/templates/_helpers.tpl
+++ b/charts/mautrix-discord/templates/_helpers.tpl
@@ -8,34 +8,3 @@ Helper for secret name
 {{- printf "mautrix-discord-config-secret" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
-
-{{/*
-Helper for registration secret name
-*/}}
-{{- define "mautrix-discord.registrationSecretName" -}}
-{{- if .Values.mautrixDiscord.existingRegistrationSecret }}
-{{- printf "%s" .Values.mautrixDiscord.existingRegistrationSecret -}}
-{{- else }}
-{{- printf "mautrix-discord-registration-secret" }}
-{{- end }}
-{{- end }}
-
-{{/*
-Generate registration.yaml if not from existing secret
-*/}}
-{{- define "mautrix-discord.registration-yaml" -}}
-id: {{ .Values.mautrixDiscord.config.appservice.id | quote }}
-as_token: {{ .Values.mautrixDiscord.config.appservice.as_token | quote }}
-hs_token: {{ .Values.mautrixDiscord.config.appservice.hs_token | quote }}
-namespaces:
-  users:
-    - regex: {{ printf "^@discordbot:%s$" (replace "." "\\." .Values.mautrixDiscord.config.homeserver.domain) }}
-      exclusive: true
-    - regex: {{ printf "^@%s:%s$" (replace "{{.}}" ".*" (tpl .Values.mautrixDiscord.config.bridge.username_template .)) (replace "." "\\." .Values.mautrixDiscord.config.homeserver.domain) }}
-      exclusive: true
-url: {{ .Values.mautrixDiscord.config.appservice.address | quote }}
-sender_localpart: {{ .Values.mautrixDiscord.registration.sender_localpart | quote }}
-rate_limited: {{ .Values.mautrixDiscord.registration.rate_limited }}
-de.sorunome.msc2409.push_ephemeral: true
-push_ephemeral: true
-{{- end -}}
diff --git a/charts/mautrix-discord/templates/deployment.yaml b/charts/mautrix-discord/templates/deployment.yaml
index 52b3da9..624660a 100644
--- a/charts/mautrix-discord/templates/deployment.yaml
+++ b/charts/mautrix-discord/templates/deployment.yaml
@@ -62,19 +62,12 @@ spec:
               mountPath: /data/config.yaml
               subPath: config.yaml
               readOnly: true
-            - name: registration
-              mountPath: /data/registration.yaml
-              subPath: registration.yaml
-              readOnly: true
             - name: data
               mountPath: /data
       volumes:
         - name: config
           secret:
             secretName: {{ template "mautrix-discord.secretName" . }}
-        - name: registration
-          secret:
-            secretName: {{ template "mautrix-discord.registrationSecretName" . }}
         - name: data
           {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
diff --git a/charts/mautrix-discord/values.yaml b/charts/mautrix-discord/values.yaml
index 29feb85..ef179a4 100644
--- a/charts/mautrix-discord/values.yaml
+++ b/charts/mautrix-discord/values.yaml
@@ -419,9 +419,3 @@ mautrixDiscord:
           max_size: 100
           max_backups: 10
           compress: true
-
-  # registration.yml contents
-  existingRegistrationSecret: ""
-  registration:
-    rate_limited: false
-    sender_localpart: discordbridgebot