diff --git a/charts/mautrix-whatsapp/Chart.yaml b/charts/mautrix-whatsapp/Chart.yaml index 30a98ec..79c8f27 100644 --- a/charts/mautrix-whatsapp/Chart.yaml +++ b/charts/mautrix-whatsapp/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: mautrix-whatsapp -version: 0.0.3 +version: 0.1.0 description: Chart for Matrix Whatsapp Bridge keywords: - matrix diff --git a/charts/mautrix-whatsapp/templates/_helpers.tpl b/charts/mautrix-whatsapp/templates/_helpers.tpl index 4009586..ed4ece2 100644 --- a/charts/mautrix-whatsapp/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/mautrix-whatsapp/templates/deployment.yaml b/charts/mautrix-whatsapp/templates/deployment.yaml index 6b25ae7..da048ec 100644 --- a/charts/mautrix-whatsapp/templates/deployment.yaml +++ b/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: diff --git a/charts/mautrix-whatsapp/values.yaml b/charts/mautrix-whatsapp/values.yaml index bed5adb..b672531 100644 --- a/charts/mautrix-whatsapp/values.yaml +++ b/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