From e7fe440f363785d0626f2f13365e116a81ac9358 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Sun, 28 Jan 2024 16:58:51 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20cloudnative-pg=20migration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudnative-pg/cluster/kustomization.yaml | 1 + .../cluster}/pgdump/externalsecret.yaml | 8 +++---- .../cluster}/pgdump/helmrelease.yaml | 6 ++--- .../cluster}/pgdump/kustomization.yaml | 0 .../default/atuin/app/externalsecret.yaml | 6 ++--- .../default/authelia/app/externalsecret.yaml | 8 ++++--- .../default/babybuddy/app/externalsecret.yaml | 4 ++-- .../default/bazarr/app/externalsecret.yaml | 4 ++-- .../default/freshrss/app/externalsecret.yaml | 4 ++-- .../ghostfolio/app/externalsecret.yaml | 6 ++--- .../home-assistant/app/externalsecret.yaml | 6 ++--- kubernetes/apps/default/homelab/ks.yaml | 24 ------------------- .../homelab/truenas/kustomization.yaml | 1 - .../default/invidious/app/externalsecret.yaml | 6 ++--- .../default/joplin/app/externalsecret.yaml | 6 ++--- .../default/kresus/app/externalsecret.yaml | 4 ++-- .../default/lidarr/app/externalsecret.yaml | 4 ++-- .../default/linkding/app/externalsecret.yaml | 4 ++-- .../default/lldap/app/externalsecret.yaml | 8 +++---- .../default/lychee/app/externalsecret.yaml | 4 ++-- .../default/outline/app/externalsecret.yaml | 8 +++---- .../apps/default/outline/app/helmrelease.yaml | 14 +++++------ .../default/paperless/app/externalsecret.yaml | 4 ++-- .../default/prowlarr/app/externalsecret.yaml | 4 ++-- .../pushover-notifier/app/externalsecret.yaml | 4 ++-- .../default/radarr/app/externalsecret.yaml | 4 ++-- .../default/sharry/app/config/sharry.conf | 2 +- .../default/sharry/app/externalsecret.yaml | 4 ++-- .../default/sonarr/app/externalsecret.yaml | 4 ++-- .../default/tandoor/app/externalsecret.yaml | 6 ++--- .../vaultwarden/app/externalsecret.yaml | 6 ++--- .../default/vikunja/app/externalsecret.yaml | 4 ++-- .../default/wallabag/app/externalsecret.yaml | 4 ++-- .../monitoring/gatus/app/externalsecret.yaml | 8 +++---- 34 files changed, 84 insertions(+), 106 deletions(-) rename kubernetes/apps/{default/homelab/truenas => database/cloudnative-pg/cluster}/pgdump/externalsecret.yaml (74%) rename kubernetes/apps/{default/homelab/truenas => database/cloudnative-pg/cluster}/pgdump/helmrelease.yaml (92%) rename kubernetes/apps/{default/homelab/truenas => database/cloudnative-pg/cluster}/pgdump/kustomization.yaml (100%) diff --git a/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml index 8d5193f11..cf401b257 100644 --- a/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml +++ b/kubernetes/apps/database/cloudnative-pg/cluster/kustomization.yaml @@ -5,5 +5,6 @@ kind: Kustomization namespace: default resources: - ./cluster16.yaml + - ./pgdump - ./prometheusrule.yaml - ./scheduledbackup.yaml diff --git a/kubernetes/apps/default/homelab/truenas/pgdump/externalsecret.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/externalsecret.yaml similarity index 74% rename from kubernetes/apps/default/homelab/truenas/pgdump/externalsecret.yaml rename to kubernetes/apps/database/cloudnative-pg/cluster/pgdump/externalsecret.yaml index 162630c1e..5d05d8156 100644 --- a/kubernetes/apps/default/homelab/truenas/pgdump/externalsecret.yaml +++ b/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/externalsecret.yaml @@ -3,23 +3,23 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: homelab-truenas-pgdump + name: cloudnative-pg-postgres16-pgdump namespace: default spec: secretStoreRef: kind: ClusterSecretStore name: onepassword-connect target: - name: homelab-truenas-pgdump-secret + name: cloudnative-pg-postgres16-pgdump-secret template: engineVersion: v2 data: # App - POSTGRES_HOST: postgres.${SECRET_DOMAIN} + POSTGRES_HOST: postgres16-rw.database.svc.cluster.local POSTGRES_USER: "{{ .POSTGRES_SUPER_USER }}" POSTGRES_PASSWORD: "{{ .POSTGRES_SUPER_PASS }}" POSTGRES_PORT: "5432" dataFrom: - extract: - key: generic + key: cloudnative-pg diff --git a/kubernetes/apps/default/homelab/truenas/pgdump/helmrelease.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/helmrelease.yaml similarity index 92% rename from kubernetes/apps/default/homelab/truenas/pgdump/helmrelease.yaml rename to kubernetes/apps/database/cloudnative-pg/cluster/pgdump/helmrelease.yaml index 3b90d21ec..55d437ec5 100644 --- a/kubernetes/apps/default/homelab/truenas/pgdump/helmrelease.yaml +++ b/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/helmrelease.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: - name: homelab-truenas-pgdump + name: cloudnative-pg-postgres16-pgdump namespace: default spec: interval: 30m @@ -39,10 +39,10 @@ spec: repository: ghcr.io/onedr0p/postgres-init tag: 16 env: - EXCLUDE_DBS: "home_assistant radarr_log sonarr_log prowlarr_log postgres template0 template1" + EXCLUDE_DBS: "home_assistant lidarr_log radarr_log sonarr_log prowlarr_log postgres template0 template1" envFrom: &envFrom - secretRef: - name: homelab-truenas-pgdump-secret + name: cloudnative-pg-postgres16-pgdump-secret command: - "/bin/bash" - "-c" diff --git a/kubernetes/apps/default/homelab/truenas/pgdump/kustomization.yaml b/kubernetes/apps/database/cloudnative-pg/cluster/pgdump/kustomization.yaml similarity index 100% rename from kubernetes/apps/default/homelab/truenas/pgdump/kustomization.yaml rename to kubernetes/apps/database/cloudnative-pg/cluster/pgdump/kustomization.yaml diff --git a/kubernetes/apps/default/atuin/app/externalsecret.yaml b/kubernetes/apps/default/atuin/app/externalsecret.yaml index d1b72a2b9..21b3e1e0b 100644 --- a/kubernetes/apps/default/atuin/app/externalsecret.yaml +++ b/kubernetes/apps/default/atuin/app/externalsecret.yaml @@ -15,10 +15,10 @@ spec: engineVersion: v2 data: # App - ATUIN_DB_URI: "postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}/atuin" + ATUIN_DB_URI: "postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local/atuin" # Postgres Init INIT_POSTGRES_DBNAME: atuin - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" @@ -26,4 +26,4 @@ spec: - extract: key: atuin - extract: - key: generic + key: cloudnative-pg diff --git a/kubernetes/apps/default/authelia/app/externalsecret.yaml b/kubernetes/apps/default/authelia/app/externalsecret.yaml index b14db6318..80c422b2b 100644 --- a/kubernetes/apps/default/authelia/app/externalsecret.yaml +++ b/kubernetes/apps/default/authelia/app/externalsecret.yaml @@ -22,11 +22,11 @@ spec: AUTHELIA_SESSION_SECRET: "{{ .AUTHELIA_SESSION_SECRET }}" AUTHELIA_STORAGE_ENCRYPTION_KEY: "{{ .AUTHELIA_STORAGE_ENCRYPTION_KEY }}" AUTHELIA_STORAGE_POSTGRES_DATABASE: &dbName authelia - AUTHELIA_STORAGE_POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + AUTHELIA_STORAGE_POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local AUTHELIA_STORAGE_POSTGRES_USERNAME: &dbUser "{{ .AUTHELIA_STORAGE_POSTGRES_USERNAME }}" AUTHELIA_STORAGE_POSTGRES_PASSWORD: &dbPass "{{ .AUTHELIA_STORAGE_POSTGRES_PASSWORD }}" - AUTHELIA_STORAGE_POSTGRES_TLS_SERVER_NAME: *dbHost - AUTHELIA_STORAGE_POSTGRES_TLS_SKIP_VERIFY: "false" + # AUTHELIA_STORAGE_POSTGRES_TLS_SERVER_NAME: *dbHost + # AUTHELIA_STORAGE_POSTGRES_TLS_SKIP_VERIFY: "false" GRAFANA_OAUTH_CLIENT_SECRET: "{{ .GRAFANA_OAUTH_CLIENT_SECRET }}" IMMICH_OAUTH_CLIENT_SECRET: "{{ .IMMICH_OAUTH_CLIENT_SECRET }}" WEAVEGITOPS_OAUTH_CLIENT_SECRET: "{{ .WEAVEGITOPS_OAUTH_CLIENT_SECRET }}" @@ -43,6 +43,8 @@ spec: dataFrom: - extract: key: authelia + - extract: + key: cloudnative-pg - extract: key: lldap - extract: diff --git a/kubernetes/apps/default/babybuddy/app/externalsecret.yaml b/kubernetes/apps/default/babybuddy/app/externalsecret.yaml index 21d2aefc9..f96943670 100644 --- a/kubernetes/apps/default/babybuddy/app/externalsecret.yaml +++ b/kubernetes/apps/default/babybuddy/app/externalsecret.yaml @@ -16,7 +16,7 @@ spec: data: # App DB_NAME: &dbName babybuddy - DB_HOST: &dbHost postgres.${SECRET_DOMAIN} + DB_HOST: &dbHost postgres16-rw.database.svc.cluster.local DB_USER: &dbUser "{{ .POSTGRES_USER }}" DB_PASS: &dbPass "{{ .POSTGRES_PASS }}" SECRET_KEY: "{{ .BABYBUDDY_SECRET_KEY }}" @@ -32,4 +32,4 @@ spec: - extract: key: babybuddy - extract: - key: generic + key: cloudnative-pg diff --git a/kubernetes/apps/default/bazarr/app/externalsecret.yaml b/kubernetes/apps/default/bazarr/app/externalsecret.yaml index 2133fecd3..f77851c18 100644 --- a/kubernetes/apps/default/bazarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/bazarr/app/externalsecret.yaml @@ -17,7 +17,7 @@ spec: # App POSTGRES_ENABLED: "true" POSTGRES_DATABASE: &dbName bazarr - POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local POSTGRES_USERNAME: &dbUser "{{ .POSTGRES_USER }}" POSTGRES_PASSWORD: &dbPass "{{ .POSTGRES_PASS }}" POSTGRES_PORT: "5432" @@ -31,4 +31,4 @@ spec: - extract: key: bazarr - extract: - key: generic + key: cloudnative-pg diff --git a/kubernetes/apps/default/freshrss/app/externalsecret.yaml b/kubernetes/apps/default/freshrss/app/externalsecret.yaml index eeaaf8d0e..997257b11 100644 --- a/kubernetes/apps/default/freshrss/app/externalsecret.yaml +++ b/kubernetes/apps/default/freshrss/app/externalsecret.yaml @@ -16,12 +16,12 @@ spec: data: # Postgres Init INIT_POSTGRES_DBNAME: freshrss - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: freshrss diff --git a/kubernetes/apps/default/ghostfolio/app/externalsecret.yaml b/kubernetes/apps/default/ghostfolio/app/externalsecret.yaml index 32b792b1c..35ffb0a45 100644 --- a/kubernetes/apps/default/ghostfolio/app/externalsecret.yaml +++ b/kubernetes/apps/default/ghostfolio/app/externalsecret.yaml @@ -16,16 +16,16 @@ spec: data: # App ACCESS_TOKEN_SALT: "{{ .GHOSTFOLIO_ACCESS_TOKEN_SALT }}" - DATABASE_URL: postgresql://{{ .POSTGRES_USERNAME }}:{{ .POSTGRES_PASSWORD }}@postgres.${SECRET_DOMAIN}:5432/ghostfolio + DATABASE_URL: postgresql://{{ .POSTGRES_USERNAME }}:{{ .POSTGRES_PASSWORD }}@postgres16-rw.database.svc.cluster.local:5432/ghostfolio JWT_SECRET_KEY: "{{ .GHOSTFOLIO_JWT_SECRET_KEY }}" # Postgres Init INIT_POSTGRES_DBNAME: ghostfolio - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USERNAME }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: ghostfolio diff --git a/kubernetes/apps/default/home-assistant/app/externalsecret.yaml b/kubernetes/apps/default/home-assistant/app/externalsecret.yaml index 54e8e21c8..8dab11a5f 100644 --- a/kubernetes/apps/default/home-assistant/app/externalsecret.yaml +++ b/kubernetes/apps/default/home-assistant/app/externalsecret.yaml @@ -18,17 +18,17 @@ spec: HASS_SECRET_ELEVATION: "{{ .HASS_ELEVATION }}" HASS_SECRET_LATITUDE: "{{ .HASS_LATITUDE }}" HASS_SECRET_LONGITUDE: "{{ .HASS_LONGITUDE }}" - HASS_SECRET_DB_URL: "postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}/home_assistant" + HASS_SECRET_DB_URL: "postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local/home_assistant" HASS_SECRET_URL: "{{ .HASS_URL }}" PROMETHEUS_TOKEN: "{{ .PROMETHEUS_TOKEN }}" # Postgres Init INIT_POSTGRES_DBNAME: home_assistant - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: home-assistant diff --git a/kubernetes/apps/default/homelab/ks.yaml b/kubernetes/apps/default/homelab/ks.yaml index 8331b68db..629bbeeba 100644 --- a/kubernetes/apps/default/homelab/ks.yaml +++ b/kubernetes/apps/default/homelab/ks.yaml @@ -76,27 +76,3 @@ spec: postBuild: substitute: APP: *app ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app photo-sort - namespace: flux-system -spec: - targetNamespace: default - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./kubernetes/apps/default/homelab/truenas/photo-sort - prune: true - sourceRef: - kind: GitRepository - name: home-ops-kubernetes - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m - postBuild: - substitute: - APP: *app diff --git a/kubernetes/apps/default/homelab/truenas/kustomization.yaml b/kubernetes/apps/default/homelab/truenas/kustomization.yaml index b0648bed8..059e471d0 100644 --- a/kubernetes/apps/default/homelab/truenas/kustomization.yaml +++ b/kubernetes/apps/default/homelab/truenas/kustomization.yaml @@ -7,5 +7,4 @@ resources: - ./backup - ./certs-deploy - ./externalsecret.yaml - - ./pgdump - ./photo-sort diff --git a/kubernetes/apps/default/invidious/app/externalsecret.yaml b/kubernetes/apps/default/invidious/app/externalsecret.yaml index e2cac4b3d..8a55c779b 100644 --- a/kubernetes/apps/default/invidious/app/externalsecret.yaml +++ b/kubernetes/apps/default/invidious/app/externalsecret.yaml @@ -16,7 +16,7 @@ spec: data: # App INVIDIOUS_CONFIG: | - database_url: postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}.:5432/invidious + database_url: postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local.:5432/invidious check_tables: true port: 3000 domain: invidious.${SECRET_CLUSTER_DOMAIN} @@ -24,12 +24,12 @@ spec: hmac_key: {{ .HMAC_KEY }} # Postgres Init INIT_POSTGRES_DBNAME: invidious - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: invidious diff --git a/kubernetes/apps/default/joplin/app/externalsecret.yaml b/kubernetes/apps/default/joplin/app/externalsecret.yaml index 7f8216b48..824499137 100644 --- a/kubernetes/apps/default/joplin/app/externalsecret.yaml +++ b/kubernetes/apps/default/joplin/app/externalsecret.yaml @@ -15,15 +15,15 @@ spec: engineVersion: v2 data: # App - POSTGRES_CONNECTION_STRING: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASSWORD }}@postgres.${SECRET_DOMAIN}:5432/joplin?sslmode=require + POSTGRES_CONNECTION_STRING: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASSWORD }}@postgres16-rw.database.svc.cluster.local:5432/joplin # Postgres Init INIT_POSTGRES_DBNAME: joplin - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: joplin diff --git a/kubernetes/apps/default/kresus/app/externalsecret.yaml b/kubernetes/apps/default/kresus/app/externalsecret.yaml index 0d55a4588..d3afea897 100644 --- a/kubernetes/apps/default/kresus/app/externalsecret.yaml +++ b/kubernetes/apps/default/kresus/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: engineVersion: v2 data: # App - KRESUS_DB_HOST: &dbHost postgres.${SECRET_DOMAIN} + KRESUS_DB_HOST: &dbHost postgres16-rw.database.svc.cluster.local KRESUS_DB_USERNAME: &dbUser "{{ .POSTGRES_USERNAME }}" KRESUS_DB_PASSWORD: &dbPass "{{ .POSTGRES_PASSWORD }}" KRESUS_DB_NAME: &dbName kresus @@ -29,6 +29,6 @@ spec: dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: kresus diff --git a/kubernetes/apps/default/lidarr/app/externalsecret.yaml b/kubernetes/apps/default/lidarr/app/externalsecret.yaml index bb2c8db90..2573f284a 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.${SECRET_DOMAIN} + LIDARR__POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local 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: generic + key: cloudnative-pg - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/linkding/app/externalsecret.yaml b/kubernetes/apps/default/linkding/app/externalsecret.yaml index 3732a8b23..c6226301d 100644 --- a/kubernetes/apps/default/linkding/app/externalsecret.yaml +++ b/kubernetes/apps/default/linkding/app/externalsecret.yaml @@ -18,7 +18,7 @@ spec: LD_DB_ENGINE: "postgres" LD_DB_USER: &dbUser "{{ .POSTGRES_USERNAME }}" LD_DB_PASSWORD: &dbPass "{{ .POSTGRES_PASSWORD }}" - LD_DB_HOST: &dbHost postgres.${SECRET_DOMAIN} + LD_DB_HOST: &dbHost postgres16-rw.database.svc.cluster.local LD_DB_DATABASE: &dbName linkding LD_SUPERUSER_NAME: "{{ .username }}" LD_SUPERUSER_PASSWORD: "{{ .password }}" @@ -30,6 +30,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: linkding diff --git a/kubernetes/apps/default/lldap/app/externalsecret.yaml b/kubernetes/apps/default/lldap/app/externalsecret.yaml index 89e4d4734..aac65a014 100644 --- a/kubernetes/apps/default/lldap/app/externalsecret.yaml +++ b/kubernetes/apps/default/lldap/app/externalsecret.yaml @@ -20,15 +20,15 @@ spec: LLDAP_USER_DN: "{{ .username }}" LLDAP_LDAP_USER_EMAIL: "{{ .LLDAP_LDAP_USER_EMAIL }}" LLDAP_SERVER_KEY_SEED: "{{ .LLDAP_SERVER_KEY_SEED }}" - LLDAP_DATABASE_URL: "postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}/lldap" + LLDAP_DATABASE_URL: "postgres://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local/lldap" # Postgres Init INIT_POSTGRES_DBNAME: lldap - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: lldap + key: cloudnative-pg - extract: - key: generic + key: lldap diff --git a/kubernetes/apps/default/lychee/app/externalsecret.yaml b/kubernetes/apps/default/lychee/app/externalsecret.yaml index 7a6a0572e..bd7572bb5 100644 --- a/kubernetes/apps/default/lychee/app/externalsecret.yaml +++ b/kubernetes/apps/default/lychee/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: engineVersion: v2 data: # App - DB_HOST: &dbHost postgres.${SECRET_DOMAIN} + DB_HOST: &dbHost postgres16-rw.database.svc.cluster.local DB_PORT: "5432" DB_DATABASE: &dbName lychee DB_USERNAME: &dbUser "{{ .POSTGRES_USERNAME }}" @@ -28,6 +28,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: lychee diff --git a/kubernetes/apps/default/outline/app/externalsecret.yaml b/kubernetes/apps/default/outline/app/externalsecret.yaml index 0ffdb0711..3994e42eb 100644 --- a/kubernetes/apps/default/outline/app/externalsecret.yaml +++ b/kubernetes/apps/default/outline/app/externalsecret.yaml @@ -19,12 +19,12 @@ spec: AWS_SECRET_ACCESS_KEY: "{{ .OUTLINE_AWS_SECRET_ACCESS_KEY }}" SECRET_KEY: "{{ .OUTLINE_SECRET_KEY }}" UTILS_SECRET: "{{ .OUTLINE_UTILS_SECRET }}" - DATABASE_URL: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}:5432/outline + DATABASE_URL: "postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local/outline" OIDC_CLIENT_SECRET: "{{ .OUTLINE_OAUTH_CLIENT_SECRET }}" - PGSSLMODE: require + # PGSSLMODE: require # Postgres Init INIT_POSTGRES_DBNAME: outline - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" @@ -32,6 +32,6 @@ spec: - extract: key: authelia - extract: - key: generic + key: cloudnative-pg - extract: key: outline diff --git a/kubernetes/apps/default/outline/app/helmrelease.yaml b/kubernetes/apps/default/outline/app/helmrelease.yaml index 7cf9f37a8..eb75d2145 100644 --- a/kubernetes/apps/default/outline/app/helmrelease.yaml +++ b/kubernetes/apps/default/outline/app/helmrelease.yaml @@ -34,13 +34,13 @@ spec: annotations: reloader.stakater.com/auto: "true" initContainers: - # init-db: - # image: - # repository: ghcr.io/onedr0p/postgres-init - # tag: 16 - # envFrom: &envFrom - # - secretRef: - # name: outline-secret + init-db: + image: + repository: ghcr.io/onedr0p/postgres-init + tag: 16 + envFrom: &envFrom + - secretRef: + name: outline-secret containers: main: image: diff --git a/kubernetes/apps/default/paperless/app/externalsecret.yaml b/kubernetes/apps/default/paperless/app/externalsecret.yaml index fc61ff1c5..58b70b5f0 100644 --- a/kubernetes/apps/default/paperless/app/externalsecret.yaml +++ b/kubernetes/apps/default/paperless/app/externalsecret.yaml @@ -20,7 +20,7 @@ spec: PAPERLESS_SECRET_KEY: "{{ .PAPERLESS_SECRET_KEY }}" PAPERLESS_DBUSER: &dbUser "{{ .POSTGRES_USER }}" PAPERLESS_DBPASS: &dbPass "{{ .POSTGRES_PASS }}" - PAPERLESS_DBHOST: &dbHost postgres.${SECRET_DOMAIN} + PAPERLESS_DBHOST: &dbHost postgres16-rw.database.svc.cluster.local PAPERLESS_DBPORT: "5432" # Postgres Init @@ -31,6 +31,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: paperless diff --git a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml index 83758d8bd..5c2621888 100644 --- a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: data: # App PROWLARR__API_KEY: "{{ .PROWLARR__API_KEY }}" - PROWLARR__POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + PROWLARR__POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local PROWLARR__POSTGRES_PORT: "5432" PROWLARR__POSTGRES_USER: &dbUser "{{ .PROWLARR__POSTGRES_USER }}" PROWLARR__POSTGRES_PASSWORD: &dbPass "{{ .PROWLARR__POSTGRES_PASSWORD }}" @@ -31,7 +31,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/pushover-notifier/app/externalsecret.yaml b/kubernetes/apps/default/pushover-notifier/app/externalsecret.yaml index cf61807a1..1c787a930 100644 --- a/kubernetes/apps/default/pushover-notifier/app/externalsecret.yaml +++ b/kubernetes/apps/default/pushover-notifier/app/externalsecret.yaml @@ -16,7 +16,7 @@ spec: data: # App POSTGRES_DB: &dbName pushover-notifier - POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local POSTGRES_USER: &dbUser "{{ .POSTGRES_USER }}" POSTGRES_PASS: &dbPass "{{ .POSTGRES_PASS }}" PUSHOVER_API_TOKEN: "{{ .PUSHOVER_API_TOKEN }}" @@ -29,7 +29,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: pushover-notifier - extract: diff --git a/kubernetes/apps/default/radarr/app/externalsecret.yaml b/kubernetes/apps/default/radarr/app/externalsecret.yaml index b67dd0122..a351afc32 100644 --- a/kubernetes/apps/default/radarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/radarr/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: data: # App RADARR__API_KEY: "{{ .RADARR__API_KEY }}" - RADARR__POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + RADARR__POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local RADARR__POSTGRES_PORT: "5432" RADARR__POSTGRES_USER: &dbUser "{{ .RADARR__POSTGRES_USER }}" RADARR__POSTGRES_PASSWORD: &dbPass "{{ .RADARR__POSTGRES_PASSWORD }}" @@ -31,7 +31,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/sharry/app/config/sharry.conf b/kubernetes/apps/default/sharry/app/config/sharry.conf index a07c51a91..feb4e7db4 100644 --- a/kubernetes/apps/default/sharry/app/config/sharry.conf +++ b/kubernetes/apps/default/sharry/app/config/sharry.conf @@ -14,7 +14,7 @@ sharry.restserver { fixed.enabled = false } jdbc { - url = "jdbc:postgresql://postgres.${SECRET_DOMAIN}:5432/sharry?ssl=true&sslmode=require" + url = "jdbc:postgresql://postgres16-rw.database.svc.cluster.local:5432/sharry" user = "${SECRET_SHARRY_DB_USERNAME}" password = "${SECRET_SHARRY_DB_PASSWORD}" } diff --git a/kubernetes/apps/default/sharry/app/externalsecret.yaml b/kubernetes/apps/default/sharry/app/externalsecret.yaml index 80608f9e0..44fa281c7 100644 --- a/kubernetes/apps/default/sharry/app/externalsecret.yaml +++ b/kubernetes/apps/default/sharry/app/externalsecret.yaml @@ -16,12 +16,12 @@ spec: data: # Postgres Init INIT_POSTGRES_DBNAME: sharry - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: sharry diff --git a/kubernetes/apps/default/sonarr/app/externalsecret.yaml b/kubernetes/apps/default/sonarr/app/externalsecret.yaml index 576cc5aae..714b76721 100644 --- a/kubernetes/apps/default/sonarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/sonarr/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: data: # App SONARR__API_KEY: "{{ .SONARR__API_KEY }}" - SONARR__POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + SONARR__POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local SONARR__POSTGRES_PORT: "5432" SONARR__POSTGRES_USER: &dbUser "{{ .SONARR__POSTGRES_USER }}" SONARR__POSTGRES_PASSWORD: &dbPass "{{ .SONARR__POSTGRES_PASSWORD }}" @@ -31,7 +31,7 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: pushover - extract: diff --git a/kubernetes/apps/default/tandoor/app/externalsecret.yaml b/kubernetes/apps/default/tandoor/app/externalsecret.yaml index 01c66ea31..55f1c9731 100644 --- a/kubernetes/apps/default/tandoor/app/externalsecret.yaml +++ b/kubernetes/apps/default/tandoor/app/externalsecret.yaml @@ -15,9 +15,9 @@ spec: data: # App DB_ENGINE: django.db.backends.postgresql_psycopg2 - DB_OPTIONS: '{"sslmode":"require"}' + # DB_OPTIONS: '{"sslmode":"require"}' SECRET_KEY: "{{ .TANDOOR_SECRET_KEY }}" - POSTGRES_HOST: &dbHost postgres.${SECRET_DOMAIN} + POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local POSTGRES_PORT: "5432" POSTGRES_DB: &dbName tandoor POSTGRES_USER: &dbUser "{{ .TANDOOR_POSTGRES_USER }}" @@ -30,6 +30,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: tandoor diff --git a/kubernetes/apps/default/vaultwarden/app/externalsecret.yaml b/kubernetes/apps/default/vaultwarden/app/externalsecret.yaml index fb6151f9c..7d7eb6df1 100644 --- a/kubernetes/apps/default/vaultwarden/app/externalsecret.yaml +++ b/kubernetes/apps/default/vaultwarden/app/externalsecret.yaml @@ -15,16 +15,16 @@ spec: engineVersion: v2 data: # App - DATABASE_URL: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres.${SECRET_DOMAIN}.:5432/vaultwarden + DATABASE_URL: postgresql://{{ .POSTGRES_USER }}:{{ .POSTGRES_PASS }}@postgres16-rw.database.svc.cluster.local.:5432/vaultwarden ADMIN_TOKEN: "{{ .VAULTWARDEN_ADMIN_TOKEN }}" # Postgres Init INIT_POSTGRES_DBNAME: vaultwarden - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}" INIT_POSTGRES_PASS: "{{ .POSTGRES_PASS }}" INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: vaultwarden diff --git a/kubernetes/apps/default/vikunja/app/externalsecret.yaml b/kubernetes/apps/default/vikunja/app/externalsecret.yaml index 7a664ab26..478dca3fc 100644 --- a/kubernetes/apps/default/vikunja/app/externalsecret.yaml +++ b/kubernetes/apps/default/vikunja/app/externalsecret.yaml @@ -15,7 +15,7 @@ spec: engineVersion: v2 data: # App - VIKUNJA_DATABASE_HOST: &dbHost postgres.${SECRET_DOMAIN}. + VIKUNJA_DATABASE_HOST: &dbHost postgres16-rw.database.svc.cluster.local. VIKUNJA_DATABASE_DATABASE: &dbName vikunja VIKUNJA_DATABASE_USER: &dbUser "{{ .VIKUNJA_POSTGRES_USER }}" VIKUNJA_DATABASE_PASSWORD: &dbPass "{{ .VIKUNJA_POSTGRES_PASS }}" @@ -30,6 +30,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: vikunja diff --git a/kubernetes/apps/default/wallabag/app/externalsecret.yaml b/kubernetes/apps/default/wallabag/app/externalsecret.yaml index 60f5b1c3e..659dc1117 100644 --- a/kubernetes/apps/default/wallabag/app/externalsecret.yaml +++ b/kubernetes/apps/default/wallabag/app/externalsecret.yaml @@ -17,7 +17,7 @@ spec: # App SYMFONY__ENV__DATABASE_USER: &dbUser "{{ .POSTGRES_USER }}" SYMFONY__ENV__DATABASE_PASSWORD: &dbPass "{{ .POSTGRES_PASS }}" - SYMFONY__ENV__DATABASE_HOST: &dbHost postgres.${SECRET_DOMAIN} + SYMFONY__ENV__DATABASE_HOST: &dbHost postgres16-rw.database.svc.cluster.local SYMFONY__ENV__DATABASE_PORT: "5432" SYMFONY__ENV__DATABASE_NAME: &dbName wallabag # Postgres Init @@ -28,6 +28,6 @@ spec: INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: - key: generic + key: cloudnative-pg - extract: key: wallabag diff --git a/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml b/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml index 29b1c9551..840b63e06 100644 --- a/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml +++ b/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml @@ -18,14 +18,14 @@ spec: CUSTOM_PUSHOVER_USER_KEY: '{{ .PUSHOVER_USER_KEY }}' # Postgres Init INIT_POSTGRES_DBNAME: gatus - INIT_POSTGRES_HOST: postgres.${SECRET_DOMAIN} + INIT_POSTGRES_HOST: postgres16-rw.database.svc.cluster.local INIT_POSTGRES_USER: '{{ .POSTGRES_USER }}' INIT_POSTGRES_PASS: '{{ .POSTGRES_PASS }}' INIT_POSTGRES_SUPER_PASS: '{{ .POSTGRES_SUPER_PASS }}' dataFrom: - extract: - key: generic - - extract: - key: pushover + key: cloudnative-pg - extract: key: gatus + - extract: + key: pushover