Fix k8s-objects

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))

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"})
+         (filter
-          (postgres/generate-secret auth)
+          #(not (nil? %))
-          (postgres/generate-pvc {:pv-storage-size-gb 50
+          (cm/concat-vec
-                                  :pvc-storage-class-name default-storage-class})
+           [(postgres/generate-config {:postgres-size :8gb :db-name "nextcloud"})
-          (postgres/generate-deployment)
+            (postgres/generate-secret auth)
-          (postgres/generate-service)
+            (postgres/generate-pvc {:pv-storage-size-gb 50
-          (nextcloud/generate-secret auth)
+                                    :pvc-storage-class-name default-storage-class})
-          (nextcloud/generate-pvc (merge nextcloud-default-storage-config config))
+            (postgres/generate-deployment)
-          (nextcloud/generate-deployment config)
+            (postgres/generate-service)
-          (nextcloud/generate-service)]
+            (nextcloud/generate-secret auth)
-         (nextcloud/generate-ingress-and-cert config)
+            (nextcloud/generate-pvc (merge nextcloud-default-storage-config config))
-         (when (:contains? config :restic-repository)
+            (nextcloud/generate-deployment config)
-           [(backup/generate-config config)
+            (nextcloud/generate-service)]
-            (backup/generate-secret auth)
+           (nextcloud/generate-ingress-and-cert config)
-            (backup/generate-cron)
+           (when (:contains? config :restic-repository)
-            (backup/generate-backup-restore-deployment config)])
+             [(backup/generate-config config)
-         (when (:contains? config :mon-cfg)
+              (backup/generate-secret auth)
-           (mon/generate (:mon-cfg config) (:mon-auth auth))))))
+              (backup/generate-cron)
+              (backup/generate-backup-restore-deployment config)])
+           (when (:contains? config :mon-cfg)
+             (mon/generate (:mon-cfg config) (:mon-auth auth))))))))