commit 72fcd4fe08ac25749e298daa1cff761e0f0ad511 parent 0c7dd0774be81053dff9b238732ed3e636c7f20a Author: MTRNord <mtrnord1@gmail.com> Date: Wed, 25 Sep 2024 17:49:21 +0200 Merge config Diffstat:
| M | apps/2024_cluster/secrets/mas_config.yaml | | | 19 | ++++++++++--------- |
| M | apps/base/matrix/mas/mas_deployment.yaml | | | 11 | ++++------- |
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/apps/2024_cluster/secrets/mas_config.yaml b/apps/2024_cluster/secrets/mas_config.yaml @@ -5,7 +5,8 @@ metadata: namespace: matrix type: Opaque stringData: - config: ENC[AES256_GCM,data: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,iv:yHoOyUY1LeQr15PWSTdJrI2LTLHAoIsU4rIGrb1qxuE=,tag:FYgmoEAHo2gCq/ySyhDY2Q==,type:str] + config: ENC[AES256_GCM,data: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,iv:YiGDtjsIZDKr1MJeFTTSFyxDqhuAgHX62Arn6tHtLq8=,tag:0hzHYSb/3RuGzqF0YWWHjg==,type:str] + merged-synapse-config: ENC[AES256_GCM,data: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,iv:bNBWybGqpooxWJB5k/KwC9HpGGo72BjIYsHiYoQND8U=,tag:sxGHSS+nI+VGb3b4cyGWog==,type:str] sops: kms: [] gcp_kms: [] @@ -15,14 +16,14 @@ sops: - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmamFTdHoxbHFlN21DQkRB - dC9VUkZUQiswKzVwWnVOcGNhbnArOGRQMUdRCllTNDMyWVo4cGNrY282cmV2V2Zp - RERHTjB6YVhXWVhsZW5TWE5UOU1NT1EKLS0tIFAxN3JsOXlzeFlkZ3QvVUVUZ2x5 - RkdjMUVZZDBNMHIvaEFZaDJvdFFwRjQKZpVk60YOsrHnbZVEcUZrynpasAM5yi33 - kiU78jeTt9ePdNctFMiiA4DryZoDKK9UE7gvTS2NVeD/bo5w5/S10g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXc2t4RGtyejIzY2Q0YjhK + VHFiQkhRelYyUXBud3o0cjkwVk53ZVZHTkZvCmZXTVk4NG1ObENUbzJqWmNGdlM3 + bUxxUnRuelJBck8yTy9oOFpGRTN0NmsKLS0tIGRNWmYwc3JWejFVSERIWjdvRitO + VmZKRWJXWWJzVVJPdXhxNGhPYVNkUEUKGi0VyROzweQFHvK+88G4PZY9mRQC5KcM + BjNvTOanggEbiysub78GnK4j3fuo8sUQ6VA9HorGS2BzwLF7uH9+9g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-25T15:12:13Z" - mac: ENC[AES256_GCM,data:7LgseJjQBugElwhoT8lsoc8bCBXkhR1aaeL9gElnQZX0dUMhzASZldEDb0mKRAkkCVOgz5pFyl8GAunfJQSaj1FP8rG4V1pruN9CUyaYeyHjmyoebVLRExfHVhhWyAeypUOxGQzHN3d5q9qHbbzxi9GnwnQknu+dRj62T7Guyuk=,iv:SboulKwqQxpEtKA5kD3cCgK/hf71YdQQZqlqkwZx2FI=,tag:W4RG2Y2F/TewmiVzbBMSGw==,type:str] + lastmodified: "2024-09-25T15:48:23Z" + mac: ENC[AES256_GCM,data:t0WxgQB9JdBATIyx93CZMRT5Lj4cnl7dKDp5MrvZwahWhuE08vawt+ZurBKa/qpgYwH4RfDIcAVx36U8AXnsUo3xyh2pImT1y+OY1vThN9OWesDQDBYzw4L1f5dxFtdwdvwOzI/LJlRGP3Q5tH4mqKP+NMUe2aoFB3dxH1VVdrI=,iv:TXYm0vXJdWkGFYiwUiWBp6x0JOftaucQhBZvBc8eoWw=,tag:jPZ3KyXSwv8QtRJQpyVqVA==,type:str] pgp: [] - encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$ + encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token)$ version: 3.8.1 diff --git a/apps/base/matrix/mas/mas_deployment.yaml b/apps/base/matrix/mas/mas_deployment.yaml @@ -20,7 +20,7 @@ spec: # Normal image #image: ghcr.io/element-hq/matrix-authentication-service:latest imagePullPolicy: Always - args: [ "--command=advisor", "--synapseConfigFile=/synapse_config/homeserver.yaml" ] + args: [ "--command=advisor", "--synapseConfigFile=/homeserver.yaml" ] # Normal mode #args: [ "server" ] ports: @@ -31,8 +31,9 @@ spec: - name: mas-config mountPath: /config.yaml subPath: config - - name: synapse-config - mountPath: /synapse_config + - name: mas-config + mountPath: /homeserver.yaml + subPath: merged-synapse-config livenessProbe: httpGet: path: /health @@ -50,10 +51,6 @@ spec: - name: mas-config secret: secretName: mas-config - - name: synapse-config - configMap: - defaultMode: 420 - name: matrix-synapse --- apiVersion: v1 kind: Service