From e733cbe016814d91079cd2dda453a9e510d61e9f Mon Sep 17 00:00:00 2001
From: Clemens Geibel <clemens.geibel@meissa-gmbh.de>
Date: Fri, 5 Aug 2022 11:37:43 +0200
Subject: [PATCH] Filter null from application yaml

---
 src/main/cljc/dda/c4k_gitea/core.cljc | 37 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main/cljc/dda/c4k_gitea/core.cljc b/src/main/cljc/dda/c4k_gitea/core.cljc
index 611e5f9..66d0022 100644
--- a/src/main/cljc/dda/c4k_gitea/core.cljc
+++ b/src/main/cljc/dda/c4k_gitea/core.cljc
@@ -9,21 +9,22 @@
   (let [storage-class (if (contains? config :postgres-data-volume-path) :manual :local-path)]
     (cm/concat-vec
      (map yaml/to-string
-          [(postgres/generate-config {:postgres-size :2gb :db-name "gitea"})
-           (postgres/generate-secret config)
-           (when (contains? config :postgres-data-volume-path)
-             (postgres/generate-persistent-volume (select-keys config [:postgres-data-volume-path :pv-storage-size-gb])))
-           (postgres/generate-pvc {:pv-storage-size-gb 5
-                                   :pvc-storage-class-name storage-class})
-           (postgres/generate-deployment {:postgres-image "postgres:14"
-                                          :postgres-size :2gb})
-           (postgres/generate-service)
-           (gitea/generate-deployment)
-           (gitea/generate-service)
-           (gitea/generate-service-ssh)
-           (gitea/generate-root-volume config)
-           (gitea/generate-data-volume config)
-           (gitea/generate-appini-env config)
-           (gitea/generate-secrets config)
-           (gitea/generate-ingress config)
-           (gitea/generate-certificate config)]))))
+          (filter #(not (nil? %))
+                  [(postgres/generate-config {:postgres-size :2gb :db-name "gitea"})
+                   (postgres/generate-secret config)
+                   (when (contains? config :postgres-data-volume-path)
+                     (postgres/generate-persistent-volume (select-keys config [:postgres-data-volume-path :pv-storage-size-gb])))
+                   (postgres/generate-pvc {:pv-storage-size-gb 5
+                                           :pvc-storage-class-name storage-class})
+                   (postgres/generate-deployment {:postgres-image "postgres:14"
+                                                  :postgres-size :2gb})
+                   (postgres/generate-service)
+                   (gitea/generate-deployment)
+                   (gitea/generate-service)
+                   (gitea/generate-service-ssh)
+                   (gitea/generate-root-volume config)
+                   (gitea/generate-data-volume config)
+                   (gitea/generate-appini-env config)
+                   (gitea/generate-secrets config)
+                   (gitea/generate-ingress config)
+                   (gitea/generate-certificate config)])))))