From 4134834d528282965313d4fc081b36cf1d61d262 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Fri, 15 Sep 2023 12:15:51 +0100
Subject: [PATCH] do-test: migrate vikunja to official chart

---
 basic/apps/do-test/vikunja-release.yaml       |   5 +-
 .../do-test/vikunja-values-configmap.yaml     | 104 +++++++++---------
 .../{k8s-at-home.yaml => vikunja.yaml}        |   5 +-
 3 files changed, 57 insertions(+), 57 deletions(-)
 rename basic/infrastructure/sources/{k8s-at-home.yaml => vikunja.yaml} (62%)

diff --git a/basic/apps/do-test/vikunja-release.yaml b/basic/apps/do-test/vikunja-release.yaml
index 49eaf8b..f045cbd 100644
--- a/basic/apps/do-test/vikunja-release.yaml
+++ b/basic/apps/do-test/vikunja-release.yaml
@@ -7,12 +7,11 @@ spec:
   releaseName: vikunja-test
   chart:
     spec:
-      # https://github.com/truecharts/charts/blob/master/charts/stable/vikunja/Chart.yaml
       chart: vikunja
-      version: 6.0.22
+      version: 0.2.1
       sourceRef:
         kind: HelmRepository
-        name: truecharts
+        name: vikunja
         namespace: flux-system
   interval: 5m
   valuesFrom:
diff --git a/basic/apps/do-test/vikunja-values-configmap.yaml b/basic/apps/do-test/vikunja-values-configmap.yaml
index e79c2d9..a921604 100644
--- a/basic/apps/do-test/vikunja-values-configmap.yaml
+++ b/basic/apps/do-test/vikunja-values-configmap.yaml
@@ -6,44 +6,30 @@ metadata:
 data:
   # https://github.com/truecharts/charts/blob/master/charts/stable/vikunja/values.yaml
   values.yaml: |
-    image:
-      tag: unstable
-      imagePullPolicy: Always
-    frontendImage:
-      tag: unstable
-      imagePullPolicy: Always
-    configmap:
-      config:
-        data:
-          vikunja.yaml: |-
-            auth:
-              openid:
-                # https://vikunja.io/docs/config-options/#openid
-                # Example: https://github.com/go-vikunja/api/blob/main/config.yml.sample#L289-L312
-                enabled: true
-                redirecturl: "https://do-test.${domain}/auth/openid/"
-                providers:
-                  - name: Stackspin
-                    authurl: "https://sso.${domain}/"
-                    clientid: "${client_id}"
-                    clientsecret: "${client_secret}"
-            service:
-              frontendurl: "https://do-test.${domain}"
-              motd: "This is a test instance, do not use for production data as it can vanish without notice! Use Stackspin login, as usual."
-              timezone: "CET"
-              JWTSecret: "${jwt}"
-            database:
-              type: postgres
-              host: vikunja-test-postgresql
-              password: "${postgresql_password}"
-            log:
-              path: "/app/vikunja"
-              http: stdout
-              database: stderr
-              databaselevel: debug
-    ingress:
-      main:
+    frontend:
+      image:
+        tag: unstable
+        pullPolicy: Always
+      ingress:
         enabled: true
+        primary: true
+        annotations:
+          kubernetes.io/tls-acme: "true"
+        hosts:
+          - host: "do-test.${domain}"
+            paths:
+               - path: /
+                 pathType: Prefix
+        tls:
+          - secretName: vikunja-test-tls
+            hosts:
+              - "do-test.${domain}"
+    api:
+      image:
+        tag: unstable
+        pullPolicy: Always
+      ingress:
+        enabled: false
         primary: false
         annotations:
           kubernetes.io/tls-acme: "true"
@@ -56,25 +42,41 @@ data:
           - secretName: vikunja-test-tls
             hosts:
               - "do-test.${domain}"
+      config: |-
+        auth:
+          openid:
+            # https://vikunja.io/docs/config-options/#openid
+            # Example: https://github.com/go-vikunja/api/blob/main/config.yml.sample#L289-L312
+            enabled: true
+            redirecturl: "https://do-test.${domain}/auth/openid/"
+            providers:
+              - name: Stackspin
+                authurl: "https://sso.${domain}/"
+                clientid: "${client_id}"
+                clientsecret: "${client_secret}"
+        service:
+          frontendurl: "https://do-test.${domain}"
+          motd: "This is a test instance, do not use for production data as it can vanish without notice! Use Stackspin login, as usual."
+          timezone: "CET"
+          JWTSecret: "${jwt}"
+        database:
+          type: postgres
+          host: vikunja-test-postgresql
+          password: "${postgresql_password}"
+        log:
+          path: "/app/vikunja"
+          http: stdout
+          database: stderr
+          databaselevel: debug
     #persistence:
     #  files:
     #    labels:
     #      stackspin.net/backupSet: "vikunja"
+    postgresqlEnabled: true
     postgresql:
-      # https://github.com/truecharts/charts/blob/master/charts/dependency/postgresql/values.yaml
-      #enabled: true
       postgresqlDatabase: vikunja
       postgresqlUsername: vikunja
       postgresqlPassword: "${postgresql_password}"
-      #persistence:
-      #  db:
-      #    enabled: true
-      #    # -- Sets the persistence type
-      #    # Valid options are: simplePVC, simpleHP, pvc, emptyDir, secret, configMap, hostPath or custom
-      #    type: pvc
-      #    mountPath: "/bitnami/postgresql"
-      #    # -- If you want to reuse an existing claim, the name of the existing PVC can be passed here.
-      #    existingClaim: vikunja-test-postgres
-      #volumeClaimTemplates:
-      #  db:
-      #    enabled: false
+      persistence:
+        enabled: true
+        existingClaim: vikunja-postgres
diff --git a/basic/infrastructure/sources/k8s-at-home.yaml b/basic/infrastructure/sources/vikunja.yaml
similarity index 62%
rename from basic/infrastructure/sources/k8s-at-home.yaml
rename to basic/infrastructure/sources/vikunja.yaml
index d504c92..87c9a4e 100644
--- a/basic/infrastructure/sources/k8s-at-home.yaml
+++ b/basic/infrastructure/sources/vikunja.yaml
@@ -1,9 +1,8 @@
-# For Vikunja
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
-  name: k8s-at-home
+  name: vikunja
   namespace: flux-system
 spec:
   interval: 60m
-  url: https://k8s-at-home.com/charts/
+  url: https://kolaente.dev/api/packages/vikunja/helm