From c1f96a1a4707d4dcbed69a019c2f52d0ab612641 Mon Sep 17 00:00:00 2001 From: see Date: Wed, 25 May 2022 10:20:16 +0200 Subject: [PATCH] updated ingress --- src/main/cljc/dda/c4k_jitsi/jitsi.cljc | 2 +- src/main/resources/jitsi/ingress.yaml | 2 +- src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index b10baf8..4a06f32 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -33,7 +33,7 @@ (defn generate-ingress [config] (let [{:keys [fqdn issuer ingress-type] :or {issuer :staging ingress-type :default}} config - letsencrypt-issuer (str "letsencrypt-" (name issuer) "-issuer") + letsencrypt-issuer (name issuer) ingress-kind (if (= :default ingress-type) "" (name ingress-type))] (-> (yaml/from-string (yaml/load-resource "jitsi/ingress.yaml")) diff --git a/src/main/resources/jitsi/ingress.yaml b/src/main/resources/jitsi/ingress.yaml index 816667d..46c542f 100644 --- a/src/main/resources/jitsi/ingress.yaml +++ b/src/main/resources/jitsi/ingress.yaml @@ -1,5 +1,5 @@ -kind: Ingress apiVersion: networking.k8s.io/v1 +kind: Ingress metadata: name: jitsi annotations: diff --git a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc index e2d4b78..9eca934 100644 --- a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc +++ b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc @@ -5,7 +5,7 @@ [dda.c4k-jitsi.jitsi :as cut])) -(deftest should-generate-webserver-deployment +(deftest should-generate-deployment (is (= {:apiVersion "apps/v1" :kind "Deployment" :metadata