commit f69d6e03bfe951ae0a7a715326c3cda0c51cdf3d
parent 3b1afaf2f6df39f2995dbbe18f307c22a290d5d0
Author: MTRNord <mtrnord1@gmail.com>
Date: Thu, 2 May 2024 14:07:39 +0200
Move draupnir for all to new infra
Diffstat:
6 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/apps/2024_cluster/kustomization.yaml b/apps/2024_cluster/kustomization.yaml
@@ -5,5 +5,6 @@ resources:
- ../base/traefik
- ../base/postgres-operator
- ../base/vaultwarden
+ - ../base/matrix/draupnir4all
patchesStrategicMerge:
- postgres-operator-values.yaml
diff --git a/apps/2024_cluster/namespaces/kustomization.yaml b/apps/2024_cluster/namespaces/kustomization.yaml
@@ -8,3 +8,4 @@ resources:
- authentik.yaml
- traefik-ingress.yaml
- vaultwarden.yaml
+ - matrix.yaml
diff --git a/apps/2024_cluster/secrets/draupnir-appservice-secret.yaml b/apps/2024_cluster/secrets/draupnir-appservice-secret.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: draupnir-appservice
+ namespace: matrix
+type: Opaque
+stringData:
+ config.appservice.yaml: ENC[AES256_GCM,data:Wq3BrWhaHDkX++wHgKLWadVlM3n8OOCTIlVbh0JgpAaSCiWuHv5DrphwbBZLI0bLfbhM6tmOaoxXEUAZlQxjgHq3CDah5JF8if2Iy93lQSvD4t/2CYS1afHSlaSYmWeOD2JwO/mcuKiZk5xTz/0oyVFQSvCrMMz1ludhQfZ2hOJ+qVMRKm42TLkj6csJetgb27IVOTKrcwRgZu5PLOsCCkfrbjGeoAyo6kE7/wXMmOfaFz5mDryUthP+AoFWmPp8xfIdRmVz6O+eg3P9kMnDzK2uXX8x0e6ohOLlGb8DXVBjAqjdNpDYj6b0UP5oEJSKxpW76ICig5BJuEHibulz6TQpbBSkeLwLuDxXcZfShfyMLHW/HBY5Q3aA3h4/4dOnxvqkKvW5zKrbFq8Igr+LKQ2WvujSMZxyX83HNBx3WfWKjAY9cp9YUFhMPo5pd/KEePbCh9GyRmLTG/VPiWQr/vgbItmgt3S5yhQ6p5PiBkdHCKgOoOW2iP2PqkyWQQxlLkis9gzcq/XOld6KEOetKK/GP6DPTDUcuDuiQETxEB/HH4dII3BKenc+NWMT00+y0apTax9o8mM++52orCgDrwG/kBZcItnLe+NBQKlkTxIfWwHl6yww4lKWETgtH6jFlh+4Wdheio4O0gbrnNsbApWexIrFpJSumQJxwysrUw1NySomoha6eylSKOe6nNk0mjSAtYD7MHYo6EOnvYZFPODlCSDEyvepS4X4r+o4TxlMX8x2V4BkP+OmAvNHR4illUrf+rpC96cm2Q67uRoTStX5BrWe8g7O7TO/TqrAC3tH4jwCv8K0GoBDCZM0usu0ModwGXvVhtgjgTepXBAQxqB9i950Rf9C9VMPIcBBm0Hbq/jcdTaD/5z4S6NUUf/YehXluWT0eiwQVrWG31wXANsNuIxmTrxxwo1NhdVTMGZWQuR31LL397nQ+IkmLUFiB1Y/OZKKbbdGW2ry919nqZRAy/gvzyBS7VkFGGEPtZ5TduZMRpWA18S3/CAHV5GHG0d0iyUTEk9fRp58HX1Gpfen8bmhrxwPvJS/Gxrn1/E=,iv:9ds9Dn3qpMaBVCDlq3R2gyb7TmZePWEGxuha48dGJpA=,tag:zOvEH2dXNIZmZfde0NlxMg==,type:str]
+ draupnir-registration.yaml: ENC[AES256_GCM,data:pRaWVeVdF6v0bDtpLo6qU4bqks/EEi5OOvpDbMJpLUk5PQZ4db7IEdMMVUF82xGyMWMKJUnfZ056vhJeB/GGy8w8wvpYYAh6ercAtX+DdxFDzUSKMIw+jQuxylTgWX7tCrN5it0UPX9t1lIzmnUb8YPzFtpCpDG0vcxtfJlcjO7B254GwhtZ6JNOZsbK8hfjHHlG6Szn16boI9DepbyATPDXuhDxfF5gjZOsr4Xb9u0/KuRSiu82cFHNe8vctLu14x8fpoCoEGaGIINWNR5m+eV77iozA7YlxXuu0gFnbvS6/xC0V4VIrKNqk10en3oY7mPLX3a7xa6sQX2EI8f+1B11sD/L6cSVy0Fxb1uaVo9muK1nFBGvwmAVSxT2o2Mz3zd4AvFLbNZVs3ZF826monGg9QaVN3NSgVk81qttK5THMRp9HTih7p04p8a4u+d5C49u0PBlt91rYS0MliFBO8xVw7UtDM2oGRrx5mztB4DVpqcRn2gCyYCykwYhfkwlYcmNx+a2FSymkJ3HTORAKrVSF6GTPia7qOWtzKrjx8ufJyFDw7ShJR7rRgtnKFC5FoJLTF7AitzGSK8nN4j2rtMnziqoUlxLt6m+oRroz7TMRRZlB3nS1Ks3ERpVDN4mHm6PImC7i6NcPCmSKzYPWtw=,iv:Y4RYiqRfN095HUydGMpHaT4TEJ+opklyaBbvxwThyso=,tag:spRL6w+RK6NFeQ53rFlqYQ==,type:str]
+ draupnir-config.yaml: ENC[AES256_GCM,data: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,iv:Zh0qc0vBZsRn8BnoJbCIQ3flKK1gLvX7kfyxRpuvJoo=,tag:6mKnv7CP/cMQILDRk5q/VQ==,type:str]
+sops:
+ kms: []
+ gcp_kms: []
+ azure_kv: []
+ hc_vault: []
+ age:
+ - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
+ enc: |
+ -----BEGIN AGE ENCRYPTED FILE-----
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiV04yY3lOaU9EVGF4d0FY
+ azU5c21hdzd5bHJYU2JJY2FnVFJSdDl1ZUdRCmcyZWpqWk1yRE14bzdjM1Mwa2U3
+ NVZ5LzlTajNTZzhza3hlc1V3eWF4MHcKLS0tIFdXWTRCa0pZNHhJM1R4OTE4S295
+ Q3B2TzFJUWFSUG4rZkYyZnZ5d2duQkkK2UlDv1JZTiWNLrQqde0sP25JUiWqecAG
+ H5kZU2IHLl/EiX2WLqZzB+zdu5totcN/m0jv6YGtV3sP04ZqtAdXxQ==
+ -----END AGE ENCRYPTED FILE-----
+ lastmodified: "2024-01-28T20:49:54Z"
+ mac: ENC[AES256_GCM,data:idq7Zcm8HxdOKyp/csr2m15GUh/YRl0FIDqZHue0g4cRx1q/N67VQPOy2Jfn5WV09dd5C9lTRa/0/06Dy1veCnjCxg4/oVW5VqOn2JC5oFA7NemSZnVQgGhdiQKvc2xtsL4UGeJdXPz1Xo00/GNIIXdcDk1G2KLhwIZ/dkcOdJY=,iv:xKxWl4Xh22pBiOEYTqUgBJS2qB4ozelfhYzF4UqmTNw=,tag:ajVrBQ5n89j9JF6N68K0lQ==,type:str]
+ pgp: []
+ encrypted_regex: ^(secret_key|adminPassword|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$
+ version: 3.8.1
diff --git a/apps/2024_cluster/secrets/kustomization.yaml b/apps/2024_cluster/secrets/kustomization.yaml
@@ -3,3 +3,4 @@ kind: Kustomization
resources:
- grafana-secret.yaml
- cloudflare.yaml
+ - draupnir-appservice-secret.yaml
diff --git a/apps/base/matrix/draupnir4all/deployment.yaml b/apps/base/matrix/draupnir4all/deployment.yaml
@@ -24,15 +24,6 @@ spec:
app.kubernetes.io/instance: main-process
app.kubernetes.io/name: draupnir4all
spec:
- # affinity:
- # nodeAffinity:
- # requiredDuringSchedulingIgnoredDuringExecution:
- # nodeSelectorTerms:
- # - matchExpressions:
- # - key: kubernetes.io/hostname
- # operator: NotIn
- # values:
- # - worker-2
tolerations:
- key: "arch"
operator: "Equal"
@@ -44,9 +35,9 @@ spec:
imagePullPolicy: Always
env:
- name: TRACING_ENABLED
- value: "true"
+ value: "false"
- name: TRACING_DIAG_ENABLED
- value: "true"
+ value: "false"
#- name: TRACING_DIAG_VERBOSE
# value: "true"
- name: TRACING_TRACE_URL
@@ -72,7 +63,7 @@ spec:
cpu: "1000m"
requests:
memory: "512Mi"
- cpu: "500m"
+ cpu: "250m"
ports:
- containerPort: 9001
name: widgets
diff --git a/apps/base/matrix/kustomization.yaml b/apps/base/matrix/kustomization.yaml
@@ -7,5 +7,5 @@ resources:
- ./sliding-proxy
- ./synapse
- ./draupnir-synapse
- - ./draupnir4all
+ #- ./draupnir4all
- ./draupnir-fluffy
