From efa7cb23c736894ead4316899fefbcdb36e539b6 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 16 May 2023 10:02:47 +0200 Subject: [PATCH] WIP implement image name replacement --- src/main/cljc/dda/c4k_forgejo/forgejo.cljc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc index 5367550..2be5d6f 100644 --- a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc +++ b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc @@ -21,6 +21,7 @@ (pred/string-of-separated-by? pred/fqdn-string? #"," input))) (s/def ::default-app-name string?) +(s/def ::forgejo-image-name string?) (s/def ::fqdn pred/fqdn-string?) (s/def ::mailer-from pred/bash-env-string?) (s/def ::mailer-host pred/bash-env-string?) @@ -34,11 +35,12 @@ (def config-defaults {:issuer "staging"}) -(def config? (s/keys :req-un [::fqdn - ::mailer-from +(def config? (s/keys :req-un [::fqdn + ::mailer-from ::mailer-host ::mailer-port - ::service-noreply-address] + ::service-noreply-address + ::deploy-federated] :opt-un [::issuer ::default-app-name ::service-domain-whitelist])) @@ -117,8 +119,10 @@ (yaml/load-as-edn "forgejo/datavolume.yaml") (cm/replace-all-matching-values-by-new-value "DATASTORAGESIZE" (str (str data-storage-size) "Gi"))))) -(defn generate-deployment - [] +(defn-spec generate-deployment pred/map-or-seq? + [config config?] + (let [{:key [deploy-federated]} config + deploy-federated-bool ()]) (yaml/load-as-edn "forgejo/deployment.yaml")) (defn generate-service