feat: overhaul

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

@@ -4,7 +4,6 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: vikunja
-  namespace: default
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -14,22 +13,29 @@ spec:
     template:
       engineVersion: v2
       data:
-        # App
-        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 }}"
-        VIKUNJA_DATABASE_SSLMODE: require
-        VIKUNJA_DATABASE_TYPE: postgres
         VIKUNJA_SERVICE_JWTSECRET: "{{ .VIKUNJA_SERVICE_JWTSECRET }}"
-        # Postgres Init
-        INIT_POSTGRES_DBNAME: *dbName
-        INIT_POSTGRES_HOST: *dbHost
-        INIT_POSTGRES_USER: *dbUser
-        INIT_POSTGRES_PASS: *dbPass
-        INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
   dataFrom:
-    - extract:
-        key: cloudnative-pg
     - extract:
         key: vikunja
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/external-secrets.io/externalsecret_v1beta1.json
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: vikunja-db
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: crunchy-pgo-secrets
+  target:
+    name: vikunja-db-secret
+    template:
+      engineVersion: v2
+      data:
+        VIKUNJA_DATABASE_HOST: '{{ index . "host" }}'
+        VIKUNJA_DATABASE_DATABASE: '{{ index . "dbname" }}'
+        VIKUNJA_DATABASE_USER: '{{ index . "user" }}'
+        VIKUNJA_DATABASE_PASSWORD: '{{ index . "password" }}'
+  dataFrom:
+    - extract:
+        key: postgres-pguser-vikunja

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

@@ -4,7 +4,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: &app vikunja
-  namespace: default
 spec:
   interval: 30m
   chart:
@@ -32,21 +31,17 @@ spec:
       vikunja:
         annotations:
           reloader.stakater.com/auto: "true"
-          configmap.reloader.stakater.com/reload: lidarr-pushover
-        initContainers:
-          init-db:
-            image:
-              repository: ghcr.io/onedr0p/postgres-init
-              tag: 16
-            envFrom: &envFrom
-              - secretRef:
-                  name: vikunja-secret
+          secret.reloader.stakater.com/reload: vikunja-db-secret
         containers:
           app:
             image:
               repository: vikunja/api
               tag: 0.22.1@sha256:c9415431e6235229302bb8f9ee6660b74c24859d1e8adbc4a3e25bd418604b57
-            envFrom: *envFrom
+            envFrom:
+              - secretRef:
+                  name: vikunja-secret
+              - secretRef:
+                  name: vikunja-db-secret
             env:
               VIKUNJA_MAILER_HOST: smtp-relay.default.svc.cluster.local.
               VIKUNJA_MAILER_PORT: "2525"
@@ -74,7 +69,7 @@ spec:
     ingress:
       app:
         enabled: true
-        className: nginx
+        className: internal
         annotations:
           external-dns.alpha.kubernetes.io/enabled: "true"
           external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}.

kubernetes/apps/default/vikunja/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/vikunja/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
     - name: rook-ceph-cluster
     - name: volsync