From 3ffd98786b45817f7f959fdf30755754939838c2 Mon Sep 17 00:00:00 2001
From: bom <mattis.boeckle@meissa-gmbh.de>
Date: Fri, 3 Feb 2023 12:27:35 +0100
Subject: [PATCH] Fix k8s-objects

---
 src/main/clj/dda/c4k_nextcloud/uberjar.clj |  2 +-
 src/main/cljc/dda/c4k_nextcloud/core.cljc  | 39 ++++++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/clj/dda/c4k_nextcloud/uberjar.clj b/src/main/clj/dda/c4k_nextcloud/uberjar.clj
index 4983f70..368a49a 100644
--- a/src/main/clj/dda/c4k_nextcloud/uberjar.clj
+++ b/src/main/clj/dda/c4k_nextcloud/uberjar.clj
@@ -11,5 +11,5 @@
    nextcloud/config?
    nextcloud/auth?
    core/config-defaults
-   core/generate
+   core/k8s-objects
    cmd-args))
diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc
index 0156b89..32fb75d 100644
--- a/src/main/cljc/dda/c4k_nextcloud/core.cljc
+++ b/src/main/cljc/dda/c4k_nextcloud/core.cljc
@@ -21,21 +21,24 @@
   (let [nextcloud-default-storage-config {:pvc-storage-class-name default-storage-class
                                           :pv-storage-size-gb 200}]
     (map yaml/to-string
-         [(postgres/generate-config {:postgres-size :8gb :db-name "nextcloud"})
-          (postgres/generate-secret auth)
-          (postgres/generate-pvc {:pv-storage-size-gb 50
-                                  :pvc-storage-class-name default-storage-class})
-          (postgres/generate-deployment)
-          (postgres/generate-service)
-          (nextcloud/generate-secret auth)
-          (nextcloud/generate-pvc (merge nextcloud-default-storage-config config))
-          (nextcloud/generate-deployment config)
-          (nextcloud/generate-service)]
-         (nextcloud/generate-ingress-and-cert config)
-         (when (:contains? config :restic-repository)
-           [(backup/generate-config config)
-            (backup/generate-secret auth)
-            (backup/generate-cron)
-            (backup/generate-backup-restore-deployment config)])
-         (when (:contains? config :mon-cfg)
-           (mon/generate (:mon-cfg config) (:mon-auth auth))))))
+         (filter
+          #(not (nil? %))
+          (cm/concat-vec
+           [(postgres/generate-config {:postgres-size :8gb :db-name "nextcloud"})
+            (postgres/generate-secret auth)
+            (postgres/generate-pvc {:pv-storage-size-gb 50
+                                    :pvc-storage-class-name default-storage-class})
+            (postgres/generate-deployment)
+            (postgres/generate-service)
+            (nextcloud/generate-secret auth)
+            (nextcloud/generate-pvc (merge nextcloud-default-storage-config config))
+            (nextcloud/generate-deployment config)
+            (nextcloud/generate-service)]
+           (nextcloud/generate-ingress-and-cert config)
+           (when (:contains? config :restic-repository)
+             [(backup/generate-config config)
+              (backup/generate-secret auth)
+              (backup/generate-cron)
+              (backup/generate-backup-restore-deployment config)])
+           (when (:contains? config :mon-cfg)
+             (mon/generate (:mon-cfg config) (:mon-auth auth))))))))