Lift postgres config from k8s-objects
Add merge namespace in let.
This commit is contained in:
parent
076bfd4d72
commit
6122e9139b
1 changed files with 25 additions and 22 deletions
|
@ -33,35 +33,38 @@
|
||||||
|
|
||||||
(def vol? (s/keys :req-un [::forgejo/volume-total-storage-size]))
|
(def vol? (s/keys :req-un [::forgejo/volume-total-storage-size]))
|
||||||
|
|
||||||
|
(def postgres-config {:db-name "forgejo"
|
||||||
|
:pv-storage-size-gb 5
|
||||||
|
:pvc-storage-class-name ""
|
||||||
|
:postgres-image "postgres:14"
|
||||||
|
:postgres-size :2gb})
|
||||||
|
|
||||||
(defn k8s-objects [config auth] ; ToDo: ADR for generate functions - vector or no vector?
|
(defn k8s-objects [config auth] ; ToDo: ADR for generate functions - vector or no vector?
|
||||||
(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)
|
||||||
|
resolved-config (merge {:namespace "forgejo"} postgres-config config)]
|
||||||
(map yaml/to-string
|
(map yaml/to-string
|
||||||
(filter #(not (nil? %))
|
(filter #(not (nil? %))
|
||||||
(cm/concat-vec
|
(cm/concat-vec
|
||||||
(ns/generate (merge {:namespace "forgejo"} config))
|
(ns/generate resolved-config)
|
||||||
[(postgres/generate-config {:postgres-size :2gb
|
[(postgres/generate-config resolved-config)
|
||||||
:db-name "forgejo"
|
(postgres/generate-secret {:namespace "forgejo"} auth)
|
||||||
:namespace "forgejo"})
|
(when (contains? resolved-config :postgres-data-volume-path)
|
||||||
(postgres/generate-secret auth)
|
(postgres/generate-persistent-volume (select-keys resolved-config [:postgres-data-volume-path :pv-storage-size-gb])))
|
||||||
(when (contains? config :postgres-data-volume-path)
|
(postgres/generate-pvc (merge resolved-config {:pvc-storage-class-name storage-class}))
|
||||||
(postgres/generate-persistent-volume (select-keys config [:postgres-data-volume-path :pv-storage-size-gb])))
|
(postgres/generate-deployment resolved-config)
|
||||||
(postgres/generate-pvc {:pv-storage-size-gb 5
|
(postgres/generate-service resolved-config)
|
||||||
:pvc-storage-class-name storage-class})
|
(forgejo/generate-deployment resolved-config)
|
||||||
(postgres/generate-deployment {:postgres-image "postgres:14"
|
|
||||||
:postgres-size :2gb})
|
|
||||||
(postgres/generate-service config)
|
|
||||||
(forgejo/generate-deployment config)
|
|
||||||
(forgejo/generate-service)
|
(forgejo/generate-service)
|
||||||
(forgejo/generate-service-ssh)
|
(forgejo/generate-service-ssh)
|
||||||
(forgejo/generate-data-volume config)
|
(forgejo/generate-data-volume resolved-config)
|
||||||
(forgejo/generate-appini-env config)
|
(forgejo/generate-appini-env resolved-config)
|
||||||
(forgejo/generate-secrets auth)
|
(forgejo/generate-secrets auth)
|
||||||
(forgejo/generate-rate-limit-middleware rate-limit-defaults)] ; this does not have a vector as output
|
(forgejo/generate-rate-limit-middleware rate-limit-defaults)] ; this does not have a vector as output
|
||||||
(forgejo/generate-rate-limit-ingress-and-cert (merge {:namespace "forgejo"} config)) ; this function has a vector as output
|
(forgejo/generate-rate-limit-ingress-and-cert resolved-config) ; this function has a vector as output
|
||||||
(when (contains? config :restic-repository)
|
(when (contains? resolved-config :restic-repository)
|
||||||
[(backup/generate-config config)
|
[(backup/generate-config resolved-config)
|
||||||
(backup/generate-secret auth)
|
(backup/generate-secret auth)
|
||||||
(backup/generate-cron)
|
(backup/generate-cron)
|
||||||
(backup/generate-backup-restore-deployment config)])
|
(backup/generate-backup-restore-deployment resolved-config)])
|
||||||
(when (:contains? config :mon-cfg)
|
(when (:contains? resolved-config :mon-cfg)
|
||||||
(mon/generate (:mon-cfg config) (:mon-auth auth))))))))
|
(mon/generate (:mon-cfg resolved-config) (:mon-auth auth))))))))
|
||||||
|
|
Loading…
Reference in a new issue