remove registration secret

charts/mautrix-discord/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mautrix-discord
-version: 0.0.2
+version: 0.1.1
 description: Chart for Matrix Discord Bridge
 keywords:
   - matrix

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 -}}

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:

charts/mautrix-discord/templates/secret.yaml

@@ -14,20 +14,3 @@ data:
   config.yaml: |
 {{ toYaml .Values.mautrixDiscord.config | indent 4 }}
 {{- end }}
-
----
-{{- if not .Values.mautrixDiscord.existingRegistrationSecret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mautrix-discord-registration-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: mautrix-discord-registration
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-data:
-  registration.yaml: {{ include "mautrix-discord.registration-yaml" . | b64enc | quote }}
-{{- end }}

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

charts/mautrix-whatsapp/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mautrix-whatsapp
-version: 0.0.3
+version: 0.1.1
 description: Chart for Matrix Whatsapp Bridge
 keywords:
   - matrix

charts/mautrix-whatsapp/templates/_helpers.tpl

@@ -8,34 +8,3 @@ Helper for secret name
 {{- printf "mautrix-whatsapp-config-secret" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
-
-{{/*
-Helper for registration secret name
-*/}}
-{{- define "mautrix-whatsapp.registrationSecretName" -}}
-{{- if .Values.mautrixWhatsapp.existingRegistrationSecret }}
-{{- printf "%s" .Values.mautrixWhatsapp.existingRegistrationSecret -}}
-{{- else }}
-{{- printf "mautrix-whatsapp-registration-secret" }}
-{{- end }}
-{{- end }}
-
-{{/*
-Generate registration.yaml if not from existing secret
-*/}}
-{{- define "mautrix-whatsapp.registration-yaml" -}}
-id: {{ .Values.mautrixWhatsapp.config.appservice.id | quote }}
-as_token: {{ .Values.mautrixWhatsapp.config.appservice.as_token | quote }}
-hs_token: {{ .Values.mautrixWhatsapp.config.appservice.hs_token | quote }}
-namespaces:
-  users:
-    - regex: {{ printf "^@whatsappbot:%s$" (replace "." "\\." .Values.mautrixWhatsapp.config.homeserver.domain) }}
-      exclusive: true
-    - regex: {{ printf "^@%s:%s$" (replace "{{.}}" ".*" (tpl .Values.mautrixWhatsapp.config.bridge.username_template .)) (replace "." "\\." .Values.mautrixWhatsapp.config.homeserver.domain) }}
-      exclusive: true
-url: {{ .Values.mautrixWhatsapp.config.appservice.address | quote }}
-sender_localpart: {{ .Values.mautrixWhatsapp.registration.sender_localpart | quote }}
-rate_limited: {{ .Values.mautrixWhatsapp.registration.rate_limited }}
-de.sorunome.msc2409.push_ephemeral: true
-push_ephemeral: true
-{{- end -}}

charts/mautrix-whatsapp/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-whatsapp.secretName" . }}
-        - name: registration
-          secret:
-            secretName: {{ template "mautrix-whatsapp.registrationSecretName" . }}
         - name: data
           {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:

charts/mautrix-whatsapp/templates/secret.yaml

@@ -14,20 +14,3 @@ data:
   config.yaml: |
 {{ toYaml .Values.mautrixWhatsapp.config | indent 4 }}
 {{- end }}
-
----
-{{- if not .Values.mautrixWhatsapp.existingRegistrationSecret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mautrix-whatsapp-registration-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: mautrix-whatsapp-registration
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-data:
-  registration.yaml: {{ include "mautrix-whatsapp.registration-yaml" . | b64enc | quote }}
-{{- end }}

charts/mautrix-whatsapp/values.yaml

@@ -524,9 +524,3 @@ mautrixWhatsapp:
           max_size: 100
           max_backups: 10
           compress: true
-
-  # registration.yml contents
-  existingRegistrationSecret: ""
-  registration:
-    rate_limited: false
-    sender_localpart: whatsappbridgebot