diff --git a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml index 8591218ca..24007a887 100644 --- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml +++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml @@ -16,8 +16,11 @@ dependencies: version: 0.1.1 repository: http://alexlebens.github.io/helm-charts - name: mautrix-discord - version: 0.0.2 + version: 0.1.0 repository: http://alexlebens.github.io/helm-charts + - name: mautrix-whatsapp + version: 0.1.0 + repository: http://alexlebens.github.io/helm-charts - name: redis version: 19.1.2 repository: https://charts.bitnami.com/bitnami diff --git a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml index 77b290fa4..9a319cb0a 100644 --- a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml @@ -99,13 +99,6 @@ spec: key: /cl01tl/matrix-synapse/mautrix-discord metadataPolicy: None property: config - - secretKey: registration.yaml - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/matrix-synapse/mautrix-discord - metadataPolicy: None - property: registration - secretKey: mautrix-discord-registration.yaml remoteRef: conversionStrategy: Default @@ -114,7 +107,37 @@ spec: metadataPolicy: None property: registration - +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: mautrix-whatsapp-config-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: mautrix-whatsapp-config-secret + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: web + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: config.yaml + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/matrix-synapse/mautrix-whatsapp + metadataPolicy: None + property: config + - secretKey: mautrix-whatsapp-registration.yaml + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/matrix-synapse/mautrix-whatsapp + metadataPolicy: None + property: registration --- apiVersion: external-secrets.io/v1beta1 diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml index e4ba5ff91..ad76a8379 100644 --- a/clusters/cl01tl/platform/matrix-synapse/values.yaml +++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml @@ -31,6 +31,9 @@ matrix-synapse: - name: mautrix-discord-config-secret secret: secretName: mautrix-discord-config-secret + - name: mautrix-whatsapp-config-secret + secret: + secretName: mautrix-whatsapp-config-secret extraVolumeMounts: - name: matrix-synapse-config-secret mountPath: /synapse/config/conf.d/oidc.yaml @@ -48,6 +51,10 @@ matrix-synapse: mountPath: /synapse/config/conf.d/mautrix-discord-registration.yaml subPath: mautrix-discord-registration.yaml readOnly: true + - name: mautrix-whatsapp-config-secret + mountPath: /synapse/config/conf.d/mautrix-whatsapp-registration.yaml + subPath: mautrix-whatsapp-registration.yaml + readOnly: true resources: requests: cpu: 100m @@ -134,7 +141,20 @@ mautrix-discord: size: 500Mi mautrixDiscord: existingSecret: mautrix-discord-config-secret - existingRegistrationSecret: mautrix-discord-config-secret +mautrix-whatsapp: + deployment: + resources: + requests: + cpu: 100m + memory: 128Mi + ingress: + enabled: false + persistence: + enabled: ture + storageClass: ceph-block + size: 500Mi + mautrixWhatsapp: + existingSecret: mautrix-whatsapp-config-secret redis: architecture: standalone auth: