cluster

Infrastructure files for Nordgedanken and Midnightthoughts.
git clone git://archive.git.mtrnord.blog/MTRNord/cluster.git
Log | Files | Refs | README

commit 90ff18aa9e6c2deb8abc51df8fb1d888acd6e561
parent 29ae39d1bd88c32c6614b9f99ebdf057bfb6a842
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed, 21 Jun 2023 13:33:35 +0200

Fix secret

Diffstat:
Aapps/production/secrets/draupnir-midnightthoughts-secret.yaml | 28++++++++++++++++++++++++++++
Mapps/production/secrets/kustomization.yaml | 1+
Mapps/production/secrets/synapse-midnightthoughts-secret.yaml | 18+++++++++---------
Mapps/production/synapse-draupnir.yaml | 6+++---
4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/apps/production/secrets/draupnir-midnightthoughts-secret.yaml b/apps/production/secrets/draupnir-midnightthoughts-secret.yaml @@ -0,0 +1,28 @@ +apiVersion: v1 +kind: Secret +metadata: + name: draupnir-midnightthoughts-postgresql + namespace: matrix +type: Opaque +stringData: + password: ENC[AES256_GCM,data:cZ6vLvQ47mYfgbSxLbTEH0JS7kXkG8SOXFNlDHj/NAuskM2OPGqqQvfVCGXY0uMfn2IQOhct2RVgeNS8JAPrIA==,iv:rTiOyE+IiM/4Txft2MCVDhOkxkdWv+0OcSZvr2Rpqyk=,tag:BTZVmHhi68LxLtTXA3AMJg==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxUjdWUUlIY1IvczBWdmJ0 + L1RPa3lHOE05R05seUVNN0JxMGtCdm4zUjNRCjQ2L3hMYURTQWRjaGozZWpHNmxp + VVNMWSsvTzZJdjNjTkR3UWRUakF4TVkKLS0tIDJJL3c4WmxNS0lGUXVleVNaMi9B + MUVkSVNId3VSZ01GajZuOXpJNUV4WFEKQzAYo7Skb6ym/hwD40D0QHEEZX0cF/I1 + 5fYKdf/0x5iafIJV5MLN+mCrgNCDzXZX1qhAJW+Yfu5ABx3WIGLYXg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-06-21T11:33:24Z" + mac: ENC[AES256_GCM,data:fAbiOLO6TQBM5nMDSjXrxEMWUIQg80ekfqFTqNYuYe83HMo294XTcM3ti/lZe0yxeVYtwvfr+fdEU2QRw1ySWVKpwWfnHVZzExnVv1QYnUsJkNK/3krdKCvg7BKoBKC26bc8ccV9hcODs8sERtWB5QOQs+xkP4ZHw5qDq+/Fels=,iv:RqEF01YvktUi3VHhDs4TQDZM8c4hV6caky6EZVhKm70=,tag:y06KL5Jn4Ptj8aCZ+tt0uw==,type:str] + pgp: [] + encrypted_regex: ^(data|stringData|password|postgresPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$ + version: 3.7.3 diff --git a/apps/production/secrets/kustomization.yaml b/apps/production/secrets/kustomization.yaml @@ -10,3 +10,4 @@ resources: - sliding-proxy-secret.yaml - synapse-midnightthoughts-secret.yaml - postgres-export-secret.yaml + - draupnir-midnightthoughts-secret.yaml diff --git a/apps/production/secrets/synapse-midnightthoughts-secret.yaml b/apps/production/secrets/synapse-midnightthoughts-secret.yaml @@ -5,7 +5,7 @@ metadata: namespace: matrix type: Opaque stringData: - password: ENC[AES256_GCM,data:Hwi0XfZFgPLHgOFyPhPwndfo7IsHXyJLpZzU3hS4ZUZAnOVg5fQQX5mUJ9+uj0s6QiEb0UoVcJpr47VN/MkpxA==,iv:jsk/Sc+MsK5V50WbO7bOAo0vPpBGu7sTD1hhcwsjRbA=,tag:G5FUaHdiakdD+5vHdK2Yxw==,type:str] + password: ENC[AES256_GCM,data:SH6wSgrQhwzpYuHCsCO7aj643gzY7YnHCwGF66x2pW37REBLTcSxE0k++AvIhvFFPDe5mJMjYT7yvIblthQXvw==,iv:0oRbaULXfcSxJ5XMODbYljOyD3yoOsj199l8b14F00o=,tag:azShxE/b5Ja+H5naWS9yHA==,type:str] sops: kms: [] gcp_kms: [] @@ -15,14 +15,14 @@ sops: - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4bHRUemR4QmdxQVJGejdu - R2RZUG94eFF1U28waUpiL01rZFZxUG9RQTBJCkhTTHVpZHB5Zm12M1VMQlk2ZWE3 - WFRjdkw1YUQ5ODVXVW5WVTdadHFzbnMKLS0tIDZLM3hBU21CZEdaTUdPWUxKamtD - OG5iYXQvVFpmTFRRdUpPemh3VlJyQ1UKoFtgDmm0OA1U7jV0ugkJosgt9qSWbwqi - tKEi1bLOnbdm5Frg5go94KNtsSiEruBgrRzADlvmiJ1r/Hr43yicWA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlQ0E2bi9tbElSeEtNV1Zo + V2FpTVQxVWpFbWJSWWNNb2xyUXgzck4rVWhBClY3RkZWU3dsTm5zT0dRTGhoa3Q3 + RlE2RTdvQ1NabUlNSVhCZUtmeldjd1kKLS0tIEpmV2V6d1NqQWJBbzlmWHU4YVlG + dmhFbTVJdE9LQW9OalIxeURObmJXNUkK3VLESks1E5F1siT85BQHW1YzVlNN1MRn + CM5KMsUnfAL+gNTfol28exdXMT69daTdyjdKwQ1/krwWKfVivS9BBg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-04-03T18:30:29Z" - mac: ENC[AES256_GCM,data:YrcJCNo8lk4RfqryPrgc7qpqGvP5EFWIRHwiR5OLEy3IJxwqjWcOqNgJhMHnQ6x6R391awvz6ASENEdR7jI5fLnxIEhQKccpLOvernVuh3yacskrTovz2AkP784nmtGFtarf+Prqhow9pZfwus29ufBD7DIW1TI6DE6XpebKf+Q=,iv:XKcHPzqoSs3TOcCoFpuzMf2hkckLB0M1wpt2BqeDXQ0=,tag:0tDINd5tr/gdjFdG0qMY2A==,type:str] + lastmodified: "2023-06-21T11:32:09Z" + mac: ENC[AES256_GCM,data:3AjGxTdGchNHXUVFwJdEbdDSiR/gh4FT0lKkn98L7C/Dg2psmq7SCJW15edJQP41mihvuB483fawVRiw6/6BNpC8VkRatL9xO27Mvi0PG0zmFrYgMIzq6D8h0A+dK4PD++V68OMPnd5m7NBCpMxNG0NIaJOPHc1A1To+3mMh52g=,iv:ZxQJHHynoNbywJEORA86Zl/fgqWnWVd7Ex5/KuElh/E=,tag:QLLhRawQ3lvr468xA/N8Ag==,type:str] pgp: [] - encrypted_regex: ^(data|stringData|password|registration_shared_secret|shared_secret)$ + encrypted_regex: ^(data|stringData|password|postgresPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$ version: 3.7.3 diff --git a/apps/production/synapse-draupnir.yaml b/apps/production/synapse-draupnir.yaml @@ -1,8 +1,8 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: - name: draupnir-synapse - namespace: matrix + name: draupnir-synapse + namespace: matrix spec: chart: spec: @@ -64,5 +64,5 @@ spec: externalPostgresql: username: draupnir_synapse ## The name of an existing secret with postgresql credentials - existingSecret: draupnir_synapse-midnightthoughts-postgresql + existingSecret: draupnir-midnightthoughts-postgresql database: draupnir_synapse