From 618ada9b551f49661f19c82d84cd0da246de9c2b Mon Sep 17 00:00:00 2001 From: see Date: Fri, 10 Jun 2022 15:17:41 +0200 Subject: [PATCH] updated staging value to string --- doc/SetupOnHetzner.md | 2 +- src/main/cljc/dda/c4k_gitea/core.cljc | 2 +- src/main/cljc/dda/c4k_gitea/gitea.cljc | 2 +- src/test/cljc/dda/c4k_gitea/gitea_test.cljc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/SetupOnHetzner.md b/doc/SetupOnHetzner.md index 91bfdea..aac2369 100644 --- a/doc/SetupOnHetzner.md +++ b/doc/SetupOnHetzner.md @@ -69,5 +69,5 @@ with the following config.edn: ``` {:fqdn "the-fqdn-from aws_route53_record.v4_neu" :postgres-data-volume-path "/var/postgres" ;; Volume was configured at dda-k8s-crate, results in a PersistentVolume definition. - :issuer :prod } + :issuer "prod" } ``` diff --git a/src/main/cljc/dda/c4k_gitea/core.cljc b/src/main/cljc/dda/c4k_gitea/core.cljc index 2c9890b..a0dc2d3 100644 --- a/src/main/cljc/dda/c4k_gitea/core.cljc +++ b/src/main/cljc/dda/c4k_gitea/core.cljc @@ -6,7 +6,7 @@ [dda.c4k-common.postgres :as postgres] [dda.c4k-gitea.gitea :as gitea])) -(def config-defaults {:issuer :staging}) +(def config-defaults {:issuer "staging"}) (def config? (s/keys :req-un [::gitea/fqdn] :opt-un [::gitea/issuer])) diff --git a/src/main/cljc/dda/c4k_gitea/gitea.cljc b/src/main/cljc/dda/c4k_gitea/gitea.cljc index 2faad60..56b432a 100644 --- a/src/main/cljc/dda/c4k_gitea/gitea.cljc +++ b/src/main/cljc/dda/c4k_gitea/gitea.cljc @@ -34,7 +34,7 @@ (defn generate-ingress [config] (let [{:keys [fqdn issuer] - :or {issuer :staging}} config + :or {issuer "staging"}} config letsencrypt-issuer (name issuer)] (-> (yaml/load-as-edn "gitea/ingress.yaml") diff --git a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc b/src/test/cljc/dda/c4k_gitea/gitea_test.cljc index 6951360..f35565d 100644 --- a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc +++ b/src/test/cljc/dda/c4k_gitea/gitea_test.cljc @@ -46,7 +46,7 @@ :persistentVolumeClaim {:claimName "gitea-root-pvc"}} {:name "gitea-data-volume", :persistentVolumeClaim {:claimName "gitea-data-pvc"}}]}}}} - (cut/generate-deployment {:fqdn "test.com" :issuer :staging :postgres-db-user "pg-user" :postgres-db-password "pg-pw"})))) + (cut/generate-deployment {:fqdn "test.com" :issuer "staging" :postgres-db-user "pg-user" :postgres-db-password "pg-pw"})))) (deftest should-generate-ingress @@ -68,4 +68,4 @@ :path "/", :backend {:service {:name "gitea-service", :port {:number 3000}}}}]}}]}} - (cut/generate-ingress {:fqdn "test.com" :issuer :staging})))) + (cut/generate-ingress {:fqdn "test.com" :issuer "staging"}))))