feat: overhaul

kubernetes/apps/default/joplin/app/externalsecret.yaml

@@ -1,29 +1,20 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/external-secrets.io/externalsecret_v1beta1.json
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: joplin
-  namespace: default
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: onepassword-connect
+    name: crunchy-pgo-secrets
   target:
     name: joplin-secret
     template:
       engineVersion: v2
       data:
-        # App
-        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: postgres16-rw.database.svc.cluster.local
-        INIT_POSTGRES_USER: "{{ .POSTGRES_USER }}"
-        INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}"
-        INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
+        DB_CLIENT: pg
+        POSTGRES_CONNECTION_STRING: postgresql://{{ index . "user" }}:{{ index . "password" }}@{{ index . "host" }}:{{ index . "port" }}/{{ index . "dbname" }}?sslmode=require
+        NODE_TLS_REJECT_UNAUTHORIZED: "0"
   dataFrom:
     - extract:
-        key: cloudnative-pg
-    - extract:
-        key: joplin
+        key: postgres-pguser-joplin

kubernetes/apps/default/joplin/app/helmrelease.yaml

@@ -4,7 +4,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: &app joplin
-  namespace: default
 spec:
   interval: 30m
   chart:
@@ -33,14 +32,7 @@ spec:
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
-        initContainers:
-          init-db:
-            image:
-              repository: ghcr.io/onedr0p/postgres-init
-              tag: 16
-            envFrom: &envFrom
-              - secretRef:
-                  name: joplin-secret
+          secret.reloader.stakater.com/reload: joplin-db-secret
         containers:
           app:
             image:
@@ -49,14 +41,15 @@ spec:
             env:
               APP_BASE_URL: https://joplin.${SECRET_EXTERNAL_DOMAIN}
               APP_PORT: &port 8080
-              DB_CLIENT: pg
               MAILER_ENABLED: 1
               MAILER_HOST: smtp-relay.default.svc.cluster.local.
               MAILER_PORT: 2525
               MAILER_SECURITY: none
               MAILER_NOREPLY_NAME: JoplinServer
               MAILER_NOREPLY_EMAIL: joplin@${SECRET_DOMAIN}
-            envFrom: *envFrom
+            envFrom:
+              - secretRef:
+                  name: joplin-secret
             resources:
               requests:
                 cpu: 50m
@@ -70,10 +63,8 @@ spec:
     ingress:
       app:
         enabled: true
-        className: nginx
+        className: external
         annotations:
-          external-dns.alpha.kubernetes.io/enabled: "true"
-          external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}.
           hajimari.io/icon: mdi:text
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Joplin

kubernetes/apps/default/joplin/app/kustomization.yaml

@@ -2,7 +2,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml

kubernetes/apps/default/joplin/ks.yaml

@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -16,6 +16,7 @@ spec:
     kind: GitRepository
     name: home-ops-kubernetes
   dependsOn:
+    - name: crunchy-postgres-operator-cluster
     - name: external-secrets-stores
   wait: false
   interval: 30m