From 72425b2b55627810417cfe75389255b782d8dc94 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Wed, 24 Jan 2024 02:13:51 +0100 Subject: [PATCH] fixes --- .../default/immich/app/externalsecret.yaml | 14 ++++----- .../app/machine-learning/helmrelease.yaml | 5 ++-- .../immich/app/microservices/helmrelease.yaml | 4 ++- .../immich/app/server/helmrelease.yaml | 4 ++- .../apps/default/immich/app/volumes.yaml | 29 ------------------- .../default/joplin/app/externalsecret.yaml | 14 ++++----- .../default/lidarr/app/externalsecret.yaml | 4 +-- .../default/prowlarr/app/externalsecret.yaml | 2 +- kubernetes/apps/default/prowlarr/ks.yaml | 2 -- kubernetes/apps/default/recyclarr/ks.yaml | 1 + .../default/tandoor/app/externalsecret.yaml | 1 + .../apps/default/tandoor/app/helmrelease.yaml | 6 ++-- 12 files changed, 27 insertions(+), 59 deletions(-) diff --git a/kubernetes/apps/default/immich/app/externalsecret.yaml b/kubernetes/apps/default/immich/app/externalsecret.yaml index 7eeb48382..4be48d05b 100644 --- a/kubernetes/apps/default/immich/app/externalsecret.yaml +++ b/kubernetes/apps/default/immich/app/externalsecret.yaml @@ -15,18 +15,14 @@ spec: engineVersion: v2 data: # App - DB_DATABASE_NAME: &dbName immich - DB_HOSTNAME: &dbHost postgres.${SECRET_DOMAIN} - DB_USERNAME: &dbUser "{{ .POSTGRES_USER }}" - DB_PASSWORD: &dbPass "{{ .POSTGRES_PASS }}" - DB_PORT: "5432" + DB_URL: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}:5432/immich?sslmode=require JWT_SECRET: "{{ .IMMICH_JWT_SECRET }}" TYPESENSE_API_KEY: "{{ .IMMICH_TYPESENSE_API_KEY }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbName - INIT_POSTGRES_HOST: *dbHost - INIT_POSTGRES_USER: *dbUser - INIT_POSTGRES_PASS: *dbPass + INIT_POSTGRES_DBNAME: immich + INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" + INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml index 2f27c5dfe..6c8bc6809 100644 --- a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml @@ -63,8 +63,9 @@ spec: port: 3003 persistence: library: - type: persistentVolumeClaim - existingClaim: immich-nfs + type: nfs + server: "${LOCAL_LAN_TRUENAS}" + path: /mnt/storage/apps/immich globalMounts: - path: /usr/src/app/upload cache: diff --git a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml index 580aaa18f..e425f7323 100644 --- a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml @@ -79,7 +79,9 @@ spec: enabled: false persistence: library: - existingClaim: immich-nfs + type: nfs + server: "${LOCAL_LAN_TRUENAS}" + path: /mnt/storage/apps/immich globalMounts: - path: /usr/src/app/upload geocoding-dump: diff --git a/kubernetes/apps/default/immich/app/server/helmrelease.yaml b/kubernetes/apps/default/immich/app/server/helmrelease.yaml index d212bb55b..dcaa2bb28 100644 --- a/kubernetes/apps/default/immich/app/server/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/server/helmrelease.yaml @@ -112,7 +112,9 @@ spec: globalMounts: - path: /config library: - existingClaim: immich-nfs + type: nfs + server: "${LOCAL_LAN_TRUENAS}" + path: /mnt/storage/apps/immich globalMounts: - path: *mediaLocation geocoding-dump: diff --git a/kubernetes/apps/default/immich/app/volumes.yaml b/kubernetes/apps/default/immich/app/volumes.yaml index 20ea50cf1..81e164d29 100644 --- a/kubernetes/apps/default/immich/app/volumes.yaml +++ b/kubernetes/apps/default/immich/app/volumes.yaml @@ -1,34 +1,5 @@ --- apiVersion: v1 -kind: PersistentVolume -metadata: - name: immich-nfs -spec: - storageClassName: immich-nfs - capacity: - storage: 1Mi - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - nfs: - server: ${LOCAL_LAN_TRUENAS} - path: /mnt/storage/apps/immich - mountOptions: ["nfsvers=4.2", "nconnect=8", "hard", "noatime"] ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: immich-nfs - namespace: default -spec: - accessModes: - - ReadWriteMany - storageClassName: immich-nfs - resources: - requests: - storage: 1Mi ---- -apiVersion: v1 kind: PersistentVolumeClaim metadata: name: immich-machine-learning-cache diff --git a/kubernetes/apps/default/joplin/app/externalsecret.yaml b/kubernetes/apps/default/joplin/app/externalsecret.yaml index c535a5860..7f8216b48 100644 --- a/kubernetes/apps/default/joplin/app/externalsecret.yaml +++ b/kubernetes/apps/default/joplin/app/externalsecret.yaml @@ -15,16 +15,12 @@ spec: engineVersion: v2 data: # App - POSTGRES_DATABASE: &dbName joplin - POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN}. - POSTGRES_PORT: "5432" - POSTGRES_USER: &dbUser "{{ .POSTGRES_USER }}" - POSTGRES_PASSWORD: &dbPass "{{ .POSTGRES_PASSWORD }}" + POSTGRES_CONNECTION_STRING: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASSWORD }}@postgres.${SECRET_DOMAIN}:5432/joplin?sslmode=require # Postgres Init - INIT_POSTGRES_DBNAME: *dbName - INIT_POSTGRES_HOST: *dbHost - INIT_POSTGRES_USER: *dbUser - INIT_POSTGRES_PASS: *dbPass + INIT_POSTGRES_DBNAME: joplin + INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" + INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/lidarr/app/externalsecret.yaml b/kubernetes/apps/default/lidarr/app/externalsecret.yaml index 40b269d85..bb2c8db90 100644 --- a/kubernetes/apps/default/lidarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/lidarr/app/externalsecret.yaml @@ -16,7 +16,7 @@ spec: data: # App LIDARR__API_KEY: "{{ .LIDARR__API_KEY }}" - LIDARR__POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local + LIDARR__POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} LIDARR__POSTGRES_PORT: "5432" LIDARR__POSTGRES_USER: &dbUser "{{ .LIDARR__POSTGRES_USER }}" LIDARR__POSTGRES_PASSWORD: &dbPass "{{ .LIDARR__POSTGRES_PASSWORD }}" @@ -32,7 +32,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: cloudnative-pg + key: generic - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml index da13a7a8e..83758d8bd 100644 --- a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml @@ -31,7 +31,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: cloudnative-pg + key: generic - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/prowlarr/ks.yaml b/kubernetes/apps/default/prowlarr/ks.yaml index bfaabf86a..ac72fe1d7 100644 --- a/kubernetes/apps/default/prowlarr/ks.yaml +++ b/kubernetes/apps/default/prowlarr/ks.yaml @@ -12,7 +12,6 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: rook-ceph-cluster path: ./kubernetes/apps/default/prowlarr/app prune: true sourceRef: @@ -25,4 +24,3 @@ spec: postBuild: substitute: APP: *app - VOLSYNC_CAPACITY: 2Gi diff --git a/kubernetes/apps/default/recyclarr/ks.yaml b/kubernetes/apps/default/recyclarr/ks.yaml index b6282ec9e..80bd52f41 100644 --- a/kubernetes/apps/default/recyclarr/ks.yaml +++ b/kubernetes/apps/default/recyclarr/ks.yaml @@ -25,3 +25,4 @@ spec: postBuild: substitute: APP: *app + VOLSYNC_CAPACITY: 2Gi diff --git a/kubernetes/apps/default/tandoor/app/externalsecret.yaml b/kubernetes/apps/default/tandoor/app/externalsecret.yaml index 269d32964..01c66ea31 100644 --- a/kubernetes/apps/default/tandoor/app/externalsecret.yaml +++ b/kubernetes/apps/default/tandoor/app/externalsecret.yaml @@ -15,6 +15,7 @@ spec: data: # App DB_ENGINE: django.db.backends.postgresql_psycopg2 + DB_OPTIONS: '{"sslmode":"require"}' SECRET_KEY: "{{ .TANDOOR_SECRET_KEY }}" POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} POSTGRES_PORT: "5432" diff --git a/kubernetes/apps/default/tandoor/app/helmrelease.yaml b/kubernetes/apps/default/tandoor/app/helmrelease.yaml index f2c9af8e8..1cbda63de 100644 --- a/kubernetes/apps/default/tandoor/app/helmrelease.yaml +++ b/kubernetes/apps/default/tandoor/app/helmrelease.yaml @@ -71,7 +71,7 @@ spec: DEBUG: "0" ALLOWED_HOSTS: "*" GUNICORN_MEDIA: "0" - TIMEZONE: ${TIMEZONE} + TZ: ${TIMEZONE} TANDOOR_PORT: &port 8888 FRACTION_PREF_DEFAULT: "0" COMMENT_PREF_DEFAULT: "1" @@ -169,7 +169,7 @@ spec: postRenderers: - kustomize: patchesStrategicMerge: - - kind: StatefulSet + - kind: Deployment apiVersion: apps/v1 metadata: name: tandoor @@ -178,7 +178,7 @@ spec: template: spec: initContainers: - - name: 02-init-migrate + - name: migrations volumeMounts: - name: django-js-reverse mountPath: /opt/recipes/cookbook/static/django_js_reverse