This commit is contained in:
auricom
2024-01-24 02:13:51 +01:00
parent 3f34557db7
commit 72425b2b55
12 changed files with 27 additions and 59 deletions

View File

@@ -15,18 +15,14 @@ spec:
engineVersion: v2 engineVersion: v2
data: data:
# App # App
DB_DATABASE_NAME: &dbName immich DB_URL: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}:5432/immich?sslmode=require
DB_HOSTNAME: &dbHost postgres.${SECRET_DOMAIN}
DB_USERNAME: &dbUser "{{ .POSTGRES_USER }}"
DB_PASSWORD: &dbPass "{{ .POSTGRES_PASS }}"
DB_PORT: "5432"
JWT_SECRET: "{{ .IMMICH_JWT_SECRET }}" JWT_SECRET: "{{ .IMMICH_JWT_SECRET }}"
TYPESENSE_API_KEY: "{{ .IMMICH_TYPESENSE_API_KEY }}" TYPESENSE_API_KEY: "{{ .IMMICH_TYPESENSE_API_KEY }}"
# Postgres Init # Postgres Init
INIT_POSTGRES_DBNAME: *dbName INIT_POSTGRES_DBNAME: immich
INIT_POSTGRES_HOST: *dbHost INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN}
INIT_POSTGRES_USER: *dbUser INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}"
INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}"
INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
dataFrom: dataFrom:
- extract: - extract:

View File

@@ -63,8 +63,9 @@ spec:
port: 3003 port: 3003
persistence: persistence:
library: library:
type: persistentVolumeClaim type: nfs
existingClaim: immich-nfs server: "${LOCAL_LAN_TRUENAS}"
path: /mnt/storage/apps/immich
globalMounts: globalMounts:
- path: /usr/src/app/upload - path: /usr/src/app/upload
cache: cache:

View File

@@ -79,7 +79,9 @@ spec:
enabled: false enabled: false
persistence: persistence:
library: library:
existingClaim: immich-nfs type: nfs
server: "${LOCAL_LAN_TRUENAS}"
path: /mnt/storage/apps/immich
globalMounts: globalMounts:
- path: /usr/src/app/upload - path: /usr/src/app/upload
geocoding-dump: geocoding-dump:

View File

@@ -112,7 +112,9 @@ spec:
globalMounts: globalMounts:
- path: /config - path: /config
library: library:
existingClaim: immich-nfs type: nfs
server: "${LOCAL_LAN_TRUENAS}"
path: /mnt/storage/apps/immich
globalMounts: globalMounts:
- path: *mediaLocation - path: *mediaLocation
geocoding-dump: geocoding-dump:

View File

@@ -1,34 +1,5 @@
--- ---
apiVersion: v1 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 kind: PersistentVolumeClaim
metadata: metadata:
name: immich-machine-learning-cache name: immich-machine-learning-cache

View File

@@ -15,16 +15,12 @@ spec:
engineVersion: v2 engineVersion: v2
data: data:
# App # App
POSTGRES_DATABASE: &dbName joplin POSTGRES_CONNECTION_STRING: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASSWORD }}@postgres.${SECRET_DOMAIN}:5432/joplin?sslmode=require
POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN}.
POSTGRES_PORT: "5432"
POSTGRES_USER: &dbUser "{{ .POSTGRES_USER }}"
POSTGRES_PASSWORD: &dbPass "{{ .POSTGRES_PASSWORD }}"
# Postgres Init # Postgres Init
INIT_POSTGRES_DBNAME: *dbName INIT_POSTGRES_DBNAME: joplin
INIT_POSTGRES_HOST: *dbHost INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN}
INIT_POSTGRES_USER: *dbUser INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}"
INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}"
INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
dataFrom: dataFrom:
- extract: - extract:

View File

@@ -16,7 +16,7 @@ spec:
data: data:
# App # App
LIDARR__API_KEY: "{{ .LIDARR__API_KEY }}" 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_PORT: "5432"
LIDARR__POSTGRES_USER: &dbUser "{{ .LIDARR__POSTGRES_USER }}" LIDARR__POSTGRES_USER: &dbUser "{{ .LIDARR__POSTGRES_USER }}"
LIDARR__POSTGRES_PASSWORD: &dbPass "{{ .LIDARR__POSTGRES_PASSWORD }}" LIDARR__POSTGRES_PASSWORD: &dbPass "{{ .LIDARR__POSTGRES_PASSWORD }}"
@@ -32,7 +32,7 @@ spec:
INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
dataFrom: dataFrom:
- extract: - extract:
key: cloudnative-pg key: generic
- extract: - extract:
key: pushover key: pushover
- extract: - extract:

View File

@@ -31,7 +31,7 @@ spec:
INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
dataFrom: dataFrom:
- extract: - extract:
key: cloudnative-pg key: generic
- extract: - extract:
key: pushover key: pushover
- extract: - extract:

View File

@@ -12,7 +12,6 @@ spec:
app.kubernetes.io/name: *app app.kubernetes.io/name: *app
dependsOn: dependsOn:
- name: external-secrets-stores - name: external-secrets-stores
- name: rook-ceph-cluster
path: ./kubernetes/apps/default/prowlarr/app path: ./kubernetes/apps/default/prowlarr/app
prune: true prune: true
sourceRef: sourceRef:
@@ -25,4 +24,3 @@ spec:
postBuild: postBuild:
substitute: substitute:
APP: *app APP: *app
VOLSYNC_CAPACITY: 2Gi

View File

@@ -25,3 +25,4 @@ spec:
postBuild: postBuild:
substitute: substitute:
APP: *app APP: *app
VOLSYNC_CAPACITY: 2Gi

View File

@@ -15,6 +15,7 @@ spec:
data: data:
# App # App
DB_ENGINE: django.db.backends.postgresql_psycopg2 DB_ENGINE: django.db.backends.postgresql_psycopg2
DB_OPTIONS: '{"sslmode":"require"}'
SECRET_KEY: "{{ .TANDOOR_SECRET_KEY }}" SECRET_KEY: "{{ .TANDOOR_SECRET_KEY }}"
POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN}
POSTGRES_PORT: "5432" POSTGRES_PORT: "5432"

View File

@@ -71,7 +71,7 @@ spec:
DEBUG: "0" DEBUG: "0"
ALLOWED_HOSTS: "*" ALLOWED_HOSTS: "*"
GUNICORN_MEDIA: "0" GUNICORN_MEDIA: "0"
TIMEZONE: ${TIMEZONE} TZ: ${TIMEZONE}
TANDOOR_PORT: &port 8888 TANDOOR_PORT: &port 8888
FRACTION_PREF_DEFAULT: "0" FRACTION_PREF_DEFAULT: "0"
COMMENT_PREF_DEFAULT: "1" COMMENT_PREF_DEFAULT: "1"
@@ -169,7 +169,7 @@ spec:
postRenderers: postRenderers:
- kustomize: - kustomize:
patchesStrategicMerge: patchesStrategicMerge:
- kind: StatefulSet - kind: Deployment
apiVersion: apps/v1 apiVersion: apps/v1
metadata: metadata:
name: tandoor name: tandoor
@@ -178,7 +178,7 @@ spec:
template: template:
spec: spec:
initContainers: initContainers:
- name: 02-init-migrate - name: migrations
volumeMounts: volumeMounts:
- name: django-js-reverse - name: django-js-reverse
mountPath: /opt/recipes/cookbook/static/django_js_reverse mountPath: /opt/recipes/cookbook/static/django_js_reverse