Filter null from application yaml

merge-requests/2/head
Clemens Geibel 2 years ago
parent c74c22e33d
commit e733cbe016

@ -9,21 +9,22 @@
(let [storage-class (if (contains? config :postgres-data-volume-path) :manual :local-path)] (let [storage-class (if (contains? config :postgres-data-volume-path) :manual :local-path)]
(cm/concat-vec (cm/concat-vec
(map yaml/to-string (map yaml/to-string
[(postgres/generate-config {:postgres-size :2gb :db-name "gitea"}) (filter #(not (nil? %))
(postgres/generate-secret config) [(postgres/generate-config {:postgres-size :2gb :db-name "gitea"})
(when (contains? config :postgres-data-volume-path) (postgres/generate-secret config)
(postgres/generate-persistent-volume (select-keys config [:postgres-data-volume-path :pv-storage-size-gb]))) (when (contains? config :postgres-data-volume-path)
(postgres/generate-pvc {:pv-storage-size-gb 5 (postgres/generate-persistent-volume (select-keys config [:postgres-data-volume-path :pv-storage-size-gb])))
:pvc-storage-class-name storage-class}) (postgres/generate-pvc {:pv-storage-size-gb 5
(postgres/generate-deployment {:postgres-image "postgres:14" :pvc-storage-class-name storage-class})
:postgres-size :2gb}) (postgres/generate-deployment {:postgres-image "postgres:14"
(postgres/generate-service) :postgres-size :2gb})
(gitea/generate-deployment) (postgres/generate-service)
(gitea/generate-service) (gitea/generate-deployment)
(gitea/generate-service-ssh) (gitea/generate-service)
(gitea/generate-root-volume config) (gitea/generate-service-ssh)
(gitea/generate-data-volume config) (gitea/generate-root-volume config)
(gitea/generate-appini-env config) (gitea/generate-data-volume config)
(gitea/generate-secrets config) (gitea/generate-appini-env config)
(gitea/generate-ingress config) (gitea/generate-secrets config)
(gitea/generate-certificate config)])))) (gitea/generate-ingress config)
(gitea/generate-certificate config)])))))

Loading…
Cancel
Save