commit 2b29ba6428cedfc48160305350ad6d4565141048
parent ebe7724fd9e66977df51cb2cf61bfe1a8b74e4cc
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 4 May 2024 18:02:57 +0200
Use pantalaimon again
Diffstat:
5 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/apps/2024_cluster/secrets/draupnir-freifunk-config.yaml b/apps/2024_cluster/secrets/draupnir-freifunk-config.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
data:
- production.yaml: ENC[AES256_GCM,data:1q9fMpTlexlFeNGTodBnJqeTHNY7G/n4hGBR//iiSNQb4zU7W1oW1gkl3tIdWApxZ0Qge46WoXknnSlsGtwE0tuc/PN1HmKztpvwYyJkZiyPOfNcVBF6i+VLP1head9ZS3faFJSR/Ibmqb/0Qt4PHrCWi94DNcYaNAE1OmPcr0N16uqXMmyKdmaptC5kPxsT6Fyz402hakVn+Yi+8c4LkWUDvPuA+1VRH0umaj/amDzUV38XITz7ULMmaPRHm8lleBD6Ae6+hnW7jPIgGjkOKePePAFtNs8v6NZbnZcKZhM/m7Oo/B/jxg0MQC93Ar7+Kc5byPRSjudA1aNSpAAKWri8X8WZDmqwQ941I10qwCrGhnw0pUrkRDrpo4CVQ2m7V8gtfNU7wh+A8o2Tw8BIKmx0F8/6S6pgCuS4mjd7PZrWgEcVbhOZN1Os9go8177v8tknQ+2BUGR3KH6e9to6N07fM2HplasPEVUoD0OpSSnMredbFWuCejFUAcsVMtcESfZcWjMBHDENGTXN13eC8mYiFdmjuIhtBjyXWFzigGbUkQqwtQvnA76linQ6wEiEbiwgesugnn4A6fV/muvnbXMdaghinjn3Y1G8neJkTKvx4zYKxuq/Uj4KvWPVMI7Nc+CUdjm5Dy6BPDyMCt8R+Zigpw1s7R90qwRxnmmzu/3TQ0bYy2cNpBVPxoWHqcB+uO60IUmaWQafRUDX3x/wWISZSQRfiap2zPNmvErssiBXROXb3cKwjajYC5az8jPG7L8JNa8vvMxjqzCrejfAdRSe0go9GHzEK6K7Tq8UedhP5ZW/qumtHDAxsCe+qlL02mo/ckpsz7oKfFBO5gFkLDqp8liYn1VdOj8fHeABePArB4F1hbLFegcsa4875s+hpwOEbtA+daGBVfL8HABAGn3ozmzsjFixo0Qh+x/7OCEdKwWBFOVAsvEFnLJqJu1xDsLzSBRg0V5iZc/YomeJit1pdwBBUxVMKsCt3Ps7bL2mKRThmGAwLTQ29xMRYjM1X01oBeBLnfxfYVpDtLOIw138YahjMpZ3WbCgZoj2m/osgKPU/4WO3ZRxjTJ3+HvJfvBj++c/cozThoJ9eODtA/C8eCkfLCtlYA3CLBKGSs3a2LrsQaKj7nRMdayCyBzWxIXZoWSUD9zcR+I2JzGh7KgHzl9Cmf5FKs4m9zQomt+l3YVC3iYnQ3J7SX5ItPrIn+tX9tZsF45zxdwmaW0VL50yFxw5sqZ+92heOcRFHEeMvEzeP15Qf85hs/gugfWVIGS+8ctBbM6A/XhNoY2ETB1K1KuUtcBDEbEWYYfXMZ8hiV2GB6ZSKUIKhg8y4rrZB6VPLCw7t/ddKiCVkMuqpnP+zmPFJyXDKcgH4sMY6ETWfDXERb78jH5W7Er8n6ZBgSxwEsXA3AYAAEiuwQNWvt4Kmjj2TD9DGrdSNqrI8kOHNjqIkjTTPilm/wzLd27PFraqZdS5l/S8rVzMIJJHkU7fer0=,iv:gRBnSwHB9RhW5eHlkOPKMX8fTqC8NQaSFOInY0Z0qpY=,tag:lrjnqwraFLK+60shsHO3XA==,type:str]
+ production.yaml: ENC[AES256_GCM,data:x6q2nipZ6K/x0tLkM0l8nNCHBoclcertcYCLvorLPV/W57qVHK//oDf/l4ugL9NGGDEG89kJfw72mKgk/lE7hBfSwsJr8Gu3B2tP1vhdvhTNHeJ96HHcKx2l9me32Xe78IaYFWRqaD2qM3YewZxMdOLbQvOMidHD9sAZEh0D7f8FLipJpBo3J3DynIeoz7QbEHJbIKTF/m4u0KmBhTSZjZuaBi3rfw9ykJZtziAphMnDgP7e5v7L8PxhJmwQe2vhPaYDCTMiqlRR7mOVy8ZVRHUfYLJcatRlPFjHFeVjiuB8rcqNd1KpUh+dv7MjoU75A2BRetDA857SszWl4pI1xwYG5+bCty6u1/4U7VaW00I4/u+X+FHK2O74kzdJe+lkE/ZDtWrYmzpc6jyquWZfkM3hu+vebkpkBdlPK+pEeYTSpPeH4N3UA/koIMiRuzZso0943//ZDjpfpfUrJZ7LZik9oyjfK3vI4cF8hwYrWLu+Sb2I+tVUTvIVLmmTpLUHSzWq2GBF5SDKxt0thS0S34smjcr732qGRwUbTlZyulOY40xUR5xE6j/BGHISEcVHbnspM639fU+hTpyPpWfFK1MXQC/EJ+ZRSIsHCA8AkXTiXuL6uXju5J3sYzXJlfpz3cIju60lEezerQcmmjGJMOXhrS+tNB1ns1Q938wJH23nevIODjFWThzEyOz0tY1HXv8+WmZh7yAZE+7VluV5a5RsUES1MWqlM9A8ka8P0LdZaXYhBVY8wSA75B9urZ0koqJleROtVjULoR7szzRk4zogEP71XuMzQASbgPV/pPfiZn/wqwg/dOUQQocoLV2ZsAEez85XbxCbiyZRjzDbEeOU9VGdJbPQBRGI5WfuJpdkNhujRYaYnL5RFR/6dk1IbPMTN9YdzyWn+inXRlXJ3eOyn8vomv92Ezci7MpQjdfPrYEGGJXbtWFU6aFfE/N8novs+GccNsEpdv6ced4CR+02eHnkTWcx4NhaqB7Su27W/Waugr2pKWrbVSv+RPu1oPUHv3kFDQzR5vIiTjhdhbTxwRMPBGIeXpKiMajQ8RApkII+X/Bk7HmN9gNAKkZpsIW4qw7ScSRfphpwo6oPy4/1yMeKM95+1VLeuGnFr9XYDBZuAnPenAGqYjyFaMqUFMVh9rsJ7z+D3amXjwTjfg2mvRUFNbP9RtqDf4yBw5grNT8EtO6cjAVHPojd4sgfEQV59wjUF5kb9kdlZpEYURkNmzD9CAe2jBKHwDYgWv7HhVHWa8v/FNG+O53OvKlag6To78lRF1g97zNt2oeyjb+rOFwwXcOHqz2VgFvxgQZIZPsTroPlxFLOqm4r+WP9m2X8sJ9taviq/sbaRYldMXFg0Er/AYS+d0TB3pFq4SmlVKdsO7y5xuPX84aZHJCQaOLK1GZsk/oUNeEYFmbgz3Y30drPx0/X5AmNXDjSQE2/YnCAufxT5ca91LDfMjEl8Co//zjmXGkyeKr+iqy6gtFKi81RDCYPWvWsknT0C2svi67nlYisYDOfqalotS1akjjhx7UsovCmhi4EO6Yc9H0=,iv:rPXP67smi0cTSeFDu+5A/RBWlGHvXG7U5Cdi/woedT0=,tag:Gxak2IaN6LQotM4IodACLA==,type:str]
kind: ConfigMap
metadata:
name: mjolnir-freifunk-config
@@ -14,14 +14,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFSjVsMWd4VGg2VHF2ZmJO
- dDVMZWJLMXFHR0I1S1JieklsbnkxNzZFSm1VCnFORkxra0ZZL0VZbzlrV3h0aHRy
- cXZ6ZUtuVW5sSkRiUU83R0ZBRVNONXcKLS0tIHV5cng5bDZiZUZ1aDhxUm8wVzVv
- MGtGWXNlUGN5N3V4b09kM3E3VHB6UlUKm3gsD3xQGsV4zp8xOfoaA9mup/4FN7qY
- tINQERjD41byT+xRJ5kUgbY82W3CihuI9DKs6PWK125mbIW+wZTHjA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaW56R2JYdjgwRDF6UHVN
+ QmppWXBvcEdpNm1RVHhZK3pGUzczdVN5dmpBCmRnQlFtWkcvUC8yblFUZDlMRG04
+ bmU5NXB1ek9YL2FEMS9xUmdKQVQ1M0UKLS0tIFBzbGdkZU9lQzVEamRFVzA5SGFB
+ SGdMd1J2T0VWc2tTSzlqNUZvOStmSUEKCrWyAok8FPmy48LvLNgZ/KrrViMBli27
+ MaL8csP00PXpo8I1mT5NbvhFl/xxbd23Y+8nTYiIv0WufQTpvewPdw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-05-04T12:35:12Z"
- mac: ENC[AES256_GCM,data:aDRtrsZiSSaVdGdk2n+0pj8o8lTIo6/GG8WhF3CNy01/twoySGthuoAN9faOfJHJct55sLUw5i6L9BFyzDrGSjSoW2Ysmaue97PtDw9FJzkGGvxzwlgmYvtkNDuNp3tanSDQl9Ark5+hhrazOlXMBrV+jVcrpt6LKJVHQptZb3o=,iv:tNZ9rgk2JphMGerwtrHZDryIptdnXznGLrD9QwBERqE=,tag:APZtWnVADBeWbQpyanHUiw==,type:str]
+ lastmodified: "2024-05-04T16:00:10Z"
+ mac: ENC[AES256_GCM,data:XAvieoasNFswDViqP2i83XJ7GeBDXSStC799qFHFB0U9JNUjkIIX1HdBxYDXlGSgFd5sfaJU4Wn1bjtyP5EbVdvjIcz62xe27fLrVbrKUuCrBEBso6H9k45+Z1XK2wpzGo9A3Rc6HMKvCtphSY1HfXIm+byO44ZKRD2S6oj3/DQ=,iv:eYnma0dcvKarbwMpjCCe+AlcuJs5dCVynf92voKZLZA=,tag:agkw6RV6v7bSwti2odEeaw==,type:str]
pgp: []
encrypted_regex: ^(clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|PASSWD|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|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/base/matrix/draupnir-freifunk/deployment.yaml b/apps/base/matrix/draupnir-freifunk/deployment.yaml
@@ -56,5 +56,5 @@ spec:
name: mjolnir-freifunk-config
name: config-volume
- name: storage
- persistentVolumeClaim:
- claimName: mjolnir-freifunk
+ emptyDir:
+ sizeLimit: 2048Mi
diff --git a/apps/base/matrix/draupnir-freifunk/kustomization.yaml b/apps/base/matrix/draupnir-freifunk/kustomization.yaml
@@ -3,4 +3,5 @@ kind: Kustomization
namespace: matrix
resources:
- pvc.yaml
+ - pantalaimon.yaml
- deployment.yaml
diff --git a/apps/base/matrix/draupnir-freifunk/pantalaimon.yaml b/apps/base/matrix/draupnir-freifunk/pantalaimon.yaml
@@ -0,0 +1,60 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: pantalaimon-freifunk
+ namespace: matrix
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: pantalaimon-freifunk
+ strategy:
+ rollingUpdate:
+ maxSurge: 25%
+ maxUnavailable: 25%
+ type: RollingUpdate
+ template:
+ metadata:
+ labels:
+ app: pantalaimon-freifunk
+ spec:
+ containers:
+ - image: matrixdotorg/pantalaimon:latest
+ imagePullPolicy: Always
+ livenessProbe:
+ failureThreshold: 3
+ httpGet:
+ path: /_matrix/client/v3/login
+ port: 8008
+ initialDelaySeconds: 5
+ periodSeconds: 30
+ successThreshold: 1
+ timeoutSeconds: 10
+ name: pantalaimon-freifunk-container
+ readinessProbe:
+ httpGet:
+ path: /_matrix/client/v3/login
+ port: 8008
+ initialDelaySeconds: 5
+ periodSeconds: 30
+ securityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ readOnlyRootFilesystem: true
+ #runAsNonRoot: true
+ volumeMounts:
+ - mountPath: /data/pantalaimon.conf
+ name: config-volume
+ subPath: pantalaimon.conf
+ - mountPath: /data
+ name: storage
+ volumes:
+ - configMap:
+ name: pantalaimon-freifunk-config
+ name: config-volume
+ - name: storage
+ persistentVolumeClaim:
+ claimName: pantalaimon-freifunk
diff --git a/apps/base/matrix/draupnir-freifunk/pvc.yaml b/apps/base/matrix/draupnir-freifunk/pvc.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
- name: mjolnir-freifunk
+ name: pantalaimon-freifunk
namespace: matrix
spec:
accessModes: