From 9ab1e620618b11a35275569110e16e8cb72b8805 Mon Sep 17 00:00:00 2001 From: Alexander Rogov Date: Sat, 13 Jun 2026 19:45:18 +0300 Subject: [PATCH] add test matrix cluster --- .gitignore | 1 + argocd/apps/matrix-mrt0rtikize.yaml | 75 +++++++++++++++++++++ manifests/cnpg/databases.yaml | 16 ++--- manifests/cnpg/secrets.yaml | 63 ----------------- manifests/matrix-mrt0rtikize/pg-secret.yaml | 11 +++ 5 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 .gitignore create mode 100644 argocd/apps/matrix-mrt0rtikize.yaml delete mode 100644 manifests/cnpg/secrets.yaml create mode 100644 manifests/matrix-mrt0rtikize/pg-secret.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..75f3075 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +backups/ diff --git a/argocd/apps/matrix-mrt0rtikize.yaml b/argocd/apps/matrix-mrt0rtikize.yaml new file mode 100644 index 0000000..cb2551a --- /dev/null +++ b/argocd/apps/matrix-mrt0rtikize.yaml @@ -0,0 +1,75 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: matrix-mrt0rtikize + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + sources: + - repoURL: http://gitea.gitea.svc.cluster.local:3000/admin/main.git + targetRevision: master + path: manifests/matrix-mrt0rtikize + directory: + recurse: true + include: "*.yaml" + - repoURL: ghcr.io + chart: element-hq/ess-helm/matrix-stack + targetRevision: 26.6.1 + helm: + values: | + serverName: mrt0rtikize.ru + + certManager: + clusterIssuer: letsencrypt-production + + ingress: + className: traefik + + postgres: + enabled: false + + synapse: + postgres: + host: shared-pg-rw.cnpg.svc.cluster.local + database: synapse_mrt0rtikize + user: synapse_mrt0rtikize + existingSecret: pg-creds + existingSecretKey: synapse + media: + storage: + size: 10Gi + ingress: + host: matrix.mrt0rtikize.ru + + matrixAuthenticationService: + postgres: + host: shared-pg-rw.cnpg.svc.cluster.local + database: mas_mrt0rtikize + user: mas_mrt0rtikize + existingSecret: pg-creds + existingSecretKey: mas + ingress: + host: account.mrt0rtikize.ru + + elementWeb: + ingress: + host: chat.mrt0rtikize.ru + + elementAdmin: + ingress: + host: admin.mrt0rtikize.ru + + matrixRTC: + ingress: + host: mrtc.mrt0rtikize.ru + + hookshot: + enabled: true + destination: + server: https://kubernetes.default.svc + namespace: matrix-mrt0rtikize + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/manifests/cnpg/databases.yaml b/manifests/cnpg/databases.yaml index 596f199..1a26bbc 100644 --- a/manifests/cnpg/databases.yaml +++ b/manifests/cnpg/databases.yaml @@ -6,7 +6,7 @@ metadata: spec: name: synapse_mrt0rtikize owner: synapse_mrt0rtikize - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -17,7 +17,7 @@ metadata: spec: name: mas_mrt0rtikize owner: mas_mrt0rtikize - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -28,7 +28,7 @@ metadata: spec: name: synapse_t0rt1k owner: synapse_t0rt1k - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -39,7 +39,7 @@ metadata: spec: name: mas_t0rt1k owner: mas_t0rt1k - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -50,7 +50,7 @@ metadata: spec: name: synapse_roglog owner: synapse_roglog - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -61,7 +61,7 @@ metadata: spec: name: mas_roglog owner: mas_roglog - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -72,7 +72,7 @@ metadata: spec: name: synapse_uretra owner: synapse_uretra - clusterRef: + cluster: name: shared-pg --- apiVersion: postgresql.cnpg.io/v1 @@ -83,5 +83,5 @@ metadata: spec: name: mas_uretra owner: mas_uretra - clusterRef: + cluster: name: shared-pg diff --git a/manifests/cnpg/secrets.yaml b/manifests/cnpg/secrets.yaml deleted file mode 100644 index 00fa72d..0000000 --- a/manifests/cnpg/secrets.yaml +++ /dev/null @@ -1,63 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: mrt0rtikize-pg-creds - namespace: cnpg - labels: - cnpg.io/reload: "" -type: kubernetes.io/basic-auth -stringData: - synapse: | - username: synapse_mrt0rtikize - password: change-me-synapse - mas: | - username: mas_mrt0rtikize - password: change-me-mas ---- -apiVersion: v1 -kind: Secret -metadata: - name: t0rt1k-pg-creds - namespace: cnpg - labels: - cnpg.io/reload: "" -type: kubernetes.io/basic-auth -stringData: - synapse: | - username: synapse_t0rt1k - password: change-me-synapse - mas: | - username: mas_t0rt1k - password: change-me-mas ---- -apiVersion: v1 -kind: Secret -metadata: - name: roglog-pg-creds - namespace: cnpg - labels: - cnpg.io/reload: "" -type: kubernetes.io/basic-auth -stringData: - synapse: | - username: synapse_roglog - password: change-me-synapse - mas: | - username: mas_roglog - password: change-me-mas ---- -apiVersion: v1 -kind: Secret -metadata: - name: uretra-pg-creds - namespace: cnpg - labels: - cnpg.io/reload: "" -type: kubernetes.io/basic-auth -stringData: - synapse: | - username: synapse_uretra - password: change-me-synapse - mas: | - username: mas_uretra - password: change-me-mas diff --git a/manifests/matrix-mrt0rtikize/pg-secret.yaml b/manifests/matrix-mrt0rtikize/pg-secret.yaml new file mode 100644 index 0000000..4785f32 --- /dev/null +++ b/manifests/matrix-mrt0rtikize/pg-secret.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Secret +metadata: + name: pg-creds + namespace: matrix-mrt0rtikize + labels: + app.kubernetes.io/part-of: matrix-stack +type: Opaque +stringData: + synapse: c9JA1vT3u4iumbSjUsZAOP66eMPOFZqu + mas: gDl3YTTLfNauXUCBtzroecLjRRxxpPbA