From 45f208a4ffb31d5265f4301e7964a42448a1068c Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 20:51:44 +0000 Subject: [PATCH 01/10] Update k8s/apps/pasarguard/deployment.yaml --- k8s/apps/pasarguard/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/k8s/apps/pasarguard/deployment.yaml b/k8s/apps/pasarguard/deployment.yaml index 06b81a0..1ee2195 100644 --- a/k8s/apps/pasarguard/deployment.yaml +++ b/k8s/apps/pasarguard/deployment.yaml @@ -50,6 +50,10 @@ spec: value: "/app/tls/tls.crt" - name: UVICORN_SSL_KEYFILE value: "/app/tls/tls.key" + - name: CUSTOM_TEMPLATES_DIRECTORY + value: "/code/app/templates/" + - name: SUBSCRIPTION_PAGE_TEMPLATE + value: "subscription/index.html" ports: - name: http containerPort: 8000 From 4681a3b263a3866aea63bf31a0a927a8d191b63a Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:37:17 +0000 Subject: [PATCH 02/10] Add k8s/apps/tg-bots/desubot.yaml --- k8s/apps/tg-bots/desubot.yaml | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 k8s/apps/tg-bots/desubot.yaml diff --git a/k8s/apps/tg-bots/desubot.yaml b/k8s/apps/tg-bots/desubot.yaml new file mode 100644 index 0000000..b24c6b0 --- /dev/null +++ b/k8s/apps/tg-bots/desubot.yaml @@ -0,0 +1,36 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: desubot + labels: + app: desubot + annotations: + reloader.stakater.com/auto: "true" +spec: + selector: + matchLabels: + app: desubot + replicas: 1 + strategy: + type: RollingUpdate + template: + metadata: + labels: + app: desubot + spec: + nodeSelector: + kubernetes.io/hostname: master.tail2fe2d.ts.net + containers: + - name: desubot + image: 'ultradesu/desubot:latest' + imagePullPolicy: Always + envFrom: + - secretRef: + name: desubot + env: + - name: RUST_LOG + value: "info" + + + From 439ad751e938c020f6be98acefd31b774654aa65 Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:37:35 +0000 Subject: [PATCH 03/10] Update k8s/apps/tg-bots/get-id-bot.yaml --- k8s/apps/tg-bots/{deployment.yaml => get-id-bot.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename k8s/apps/tg-bots/{deployment.yaml => get-id-bot.yaml} (100%) diff --git a/k8s/apps/tg-bots/deployment.yaml b/k8s/apps/tg-bots/get-id-bot.yaml similarity index 100% rename from k8s/apps/tg-bots/deployment.yaml rename to k8s/apps/tg-bots/get-id-bot.yaml From c9bee8c049d121e3d5ed099e7c6ac11f411cea2d Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:39:33 +0000 Subject: [PATCH 04/10] Update k8s/apps/tg-bots/external-secrets.yaml --- k8s/apps/tg-bots/external-secrets.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/k8s/apps/tg-bots/external-secrets.yaml b/k8s/apps/tg-bots/external-secrets.yaml index 78e8201..ed29056 100644 --- a/k8s/apps/tg-bots/external-secrets.yaml +++ b/k8s/apps/tg-bots/external-secrets.yaml @@ -22,3 +22,28 @@ spec: remoteRef: key: 97bd0af9-54ab-429a-b060-09626525f4cd property: fields[0].value + +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: desubot +spec: + target: + name: desubot + deletionPolicy: Delete + template: + type: Opaque + data: + TELEGRAM_BOT_TOKEN: |- + {{ .token }} + + data: + - secretKey: token + sourceRef: + storeRef: + name: vaultwarden-login + kind: ClusterSecretStore + remoteRef: + key: 97bd0af9-54ab-429a-b060-09626525f4cd + property: fields[1].value From df39182fea42889ce8b812f91673ef49314af7ae Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:40:09 +0000 Subject: [PATCH 05/10] Update k8s/apps/tg-bots/kustomization.yaml --- k8s/apps/tg-bots/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/tg-bots/kustomization.yaml b/k8s/apps/tg-bots/kustomization.yaml index f8b76b8..347e133 100644 --- a/k8s/apps/tg-bots/kustomization.yaml +++ b/k8s/apps/tg-bots/kustomization.yaml @@ -4,5 +4,5 @@ kind: Kustomization resources: - app.yaml - - deployment.yaml + - get-id-bot.yaml - external-secrets.yaml From b2701a84358efd26cbd584d6240656d8fa134a3d Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:48:22 +0000 Subject: [PATCH 06/10] Update k8s/apps/tg-bots/desubot.yaml --- k8s/apps/tg-bots/desubot.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/k8s/apps/tg-bots/desubot.yaml b/k8s/apps/tg-bots/desubot.yaml index b24c6b0..23eaac3 100644 --- a/k8s/apps/tg-bots/desubot.yaml +++ b/k8s/apps/tg-bots/desubot.yaml @@ -20,7 +20,7 @@ spec: app: desubot spec: nodeSelector: - kubernetes.io/hostname: master.tail2fe2d.ts.net + kubernetes.io/hostname: home.homenet containers: - name: desubot image: 'ultradesu/desubot:latest' @@ -31,6 +31,12 @@ spec: env: - name: RUST_LOG value: "info" - - - + volumeMounts: + - mountPath: /desubot + name: upload-storage + volumes: + - name: upload-storage + nfs: + server: nas.homenet + path: /mnt/storage/Storage/k8s/desubot/ + readOnly: false \ No newline at end of file From c7fc3504badc169864ea8af6a3bb799f82ec4b39 Mon Sep 17 00:00:00 2001 From: ab Date: Thu, 6 Nov 2025 23:48:39 +0000 Subject: [PATCH 07/10] Update k8s/apps/tg-bots/kustomization.yaml --- k8s/apps/tg-bots/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s/apps/tg-bots/kustomization.yaml b/k8s/apps/tg-bots/kustomization.yaml index 347e133..afe6e97 100644 --- a/k8s/apps/tg-bots/kustomization.yaml +++ b/k8s/apps/tg-bots/kustomization.yaml @@ -6,3 +6,4 @@ resources: - app.yaml - get-id-bot.yaml - external-secrets.yaml + - desubot.yaml From aae0255843ede4f6158f5b39af81a7dd5f444b0a Mon Sep 17 00:00:00 2001 From: ab Date: Fri, 7 Nov 2025 00:01:33 +0000 Subject: [PATCH 08/10] Update k8s/apps/tg-bots/desubot.yaml --- k8s/apps/tg-bots/desubot.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/apps/tg-bots/desubot.yaml b/k8s/apps/tg-bots/desubot.yaml index 23eaac3..8914f9d 100644 --- a/k8s/apps/tg-bots/desubot.yaml +++ b/k8s/apps/tg-bots/desubot.yaml @@ -32,10 +32,10 @@ spec: - name: RUST_LOG value: "info" volumeMounts: - - mountPath: /desubot - name: upload-storage + - mountPath: /storage + name: storage volumes: - - name: upload-storage + - name: storage nfs: server: nas.homenet path: /mnt/storage/Storage/k8s/desubot/ From e545346fece3c03c4ac5992e9bf9269c6e35b447 Mon Sep 17 00:00:00 2001 From: ab Date: Fri, 7 Nov 2025 12:46:42 +0000 Subject: [PATCH 09/10] Update k8s/core/postgresql/nas.yaml --- k8s/core/postgresql/nas.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/core/postgresql/nas.yaml b/k8s/core/postgresql/nas.yaml index 24632ed..2049bc0 100644 --- a/k8s/core/postgresql/nas.yaml +++ b/k8s/core/postgresql/nas.yaml @@ -6,7 +6,7 @@ metadata: namespace: immich spec: capacity: - storage: 50Gi + storage: 20Gi accessModes: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain @@ -79,14 +79,14 @@ spec: - CREATE EXTENSION IF NOT EXISTS earthdistance; storage: - size: 50Gi + size: 20Gi storageClass: nfs-storage pvcTemplate: accessModes: - ReadWriteOnce resources: requests: - storage: 50Gi + storage: 20Gi storageClassName: nfs-storage volumeMode: Filesystem From cbed0939fa46713220b14e68b49c64dfa0911e34 Mon Sep 17 00:00:00 2001 From: ab Date: Fri, 7 Nov 2025 12:47:25 +0000 Subject: [PATCH 10/10] Update k8s/core/postgresql/nas.yaml --- k8s/core/postgresql/nas.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/core/postgresql/nas.yaml b/k8s/core/postgresql/nas.yaml index 2049bc0..73cc06a 100644 --- a/k8s/core/postgresql/nas.yaml +++ b/k8s/core/postgresql/nas.yaml @@ -6,7 +6,7 @@ metadata: namespace: immich spec: capacity: - storage: 20Gi + storage: 55Gi accessModes: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain @@ -79,14 +79,14 @@ spec: - CREATE EXTENSION IF NOT EXISTS earthdistance; storage: - size: 20Gi + size: 55Gi storageClass: nfs-storage pvcTemplate: accessModes: - ReadWriteOnce resources: requests: - storage: 20Gi + storage: 55Gi storageClassName: nfs-storage volumeMode: Filesystem