meissa/c4k-website
6
5
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

refactor alias

Browse source
This commit is contained in:
Michael Jerger 2024-02-29 16:02:20 +01:00
parent 9efbf4dbc4
commit d7be8aa730
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/cljc/dda/c4k_website/core.cljc
View file

@ -9,23 +9,23 @@
[dda.c4k-common.monitoring :as mon] [dda.c4k-common.monitoring :as mon]
[dda.c4k-common.namespace :as ns] [dda.c4k-common.namespace :as ns]
[dda.c4k-common.ingress :as ing] [dda.c4k-common.ingress :as ing]
[dda.c4k-website.website :as int])) [dda.c4k-website.website :as web]))
(s/def ::mon-cfg ::mon/mon-cfg) (s/def ::mon-cfg ::mon/mon-cfg)
(s/def ::mon-auth ::mon/mon-auth) (s/def ::mon-auth ::mon/mon-auth)
(s/def ::unique-name ::int/unique-name) (s/def ::unique-name ::web/unique-name)
(s/def ::issuer ::int/issuer) (s/def ::issuer ::web/issuer)
(s/def ::volume-size ::int/volume-size) (s/def ::volume-size ::web/volume-size)
(s/def ::authtoken ::int/authtoken) (s/def ::authtoken ::web/authtoken)
(s/def ::fqdns ::int/fqdns) (s/def ::fqdns ::web/fqdns)
(s/def ::forgejo-host ::int/forgejo-host) (s/def ::forgejo-host ::web/forgejo-host)
(s/def ::forgejo-repo ::int/forgejo-repo) (s/def ::forgejo-repo ::web/forgejo-repo)
(s/def ::branchname ::int/branchname) (s/def ::branchname ::web/branchname)
(s/def ::username ::int/username) (s/def ::username ::web/username)
(s/def ::build-cpu-request ::int/build-cpu-request) (s/def ::build-cpu-request ::web/build-cpu-request)
(s/def ::build-memory-request ::int/build-memory-request) (s/def ::build-memory-request ::web/build-memory-request)
(s/def ::build-cpu-limit ::int/build-cpu-limit) (s/def ::build-cpu-limit ::web/build-cpu-limit)
(s/def ::build-memory-limit ::int/build-memory-limit) (s/def ::build-memory-limit ::web/build-memory-limit)
(def websiteconfig? (s/keys :req-un [::unique-name (def websiteconfig? (s/keys :req-un [::unique-name
::fqdns ::fqdns
@ -88,7 +88,7 @@
(defn-spec generate-ingress seq? (defn-spec generate-ingress seq?
[config websiteconfig?] [config websiteconfig?]
(let [name (int/replace-dots-by-minus (:unique-name config)) (let [name (web/replace-dots-by-minus (:unique-name config))
final-config (merge website-config-defaults final-config (merge website-config-defaults
{:service-name name {:service-name name
:service-port 80 :service-port 80
@ -115,17 +115,17 @@
(merge (merge
website-config-defaults website-config-defaults
(flatten-and-reduce-config config)) (flatten-and-reduce-config config))
name (int/replace-dots-by-minus (:unique-name final-config))] name (web/replace-dots-by-minus (:unique-name final-config))]
(cm/concat-vec (cm/concat-vec
result result
(ns/generate (merge {:namespace name} final-config)) (ns/generate (merge {:namespace name} final-config))
[(int/generate-nginx-deployment final-config) [(web/generate-nginx-deployment final-config)
(int/generate-nginx-configmap final-config) (web/generate-nginx-configmap final-config)
(int/generate-nginx-service final-config) (web/generate-nginx-service final-config)
(int/generate-content-pvc final-config) (web/generate-content-pvc final-config)
(int/generate-hash-state-pvc final-config) (web/generate-hash-state-pvc final-config)
(int/generate-build-cron final-config) (web/generate-build-cron final-config)
(int/generate-build-secret final-config (web/generate-build-secret final-config
(flatten-and-reduce-auth auth))] (flatten-and-reduce-auth auth))]
(generate-ingress final-config))))))) (generate-ingress final-config)))))))