add excalidraw

src/main/cljc/dda/c4k_jitsi/core.cljc

@@ -40,7 +40,8 @@
            (jitsi/web-config resolved-config)
            (jitsi/jvb-config resolved-config)
            (jitsi/jibri-config resolved-config)
-           (jitsi/etherpad resolved-config)
+           (jitsi/etherpad-config resolved-config)
+           (jitsi/excalidraw-config resolved-config)
            (ing/generate-ingress-and-cert (merge
                                            {:service-name "jitsi-meet-web"
                                             :service-port 80

src/main/cljc/dda/c4k_jitsi/jitsi.cljc

@@ -123,12 +123,11 @@
     [(load-and-adjust-namespace "jitsi/etherpad-config-service.yaml" namespace)
      (load-and-adjust-namespace "jitsi/etherpad-config-deployment.yaml" namespace)]))
 
-(defn-spec generate-excalidraw-backend-service cp/map-or-seq?
+(defn-spec excalidraw-config cp/map-or-seq?
   [config config?]
   (let [{:keys [namespace]} config]
-    (->
+    [(load-and-adjust-namespace "jitsi/excalidraw-config-service.yaml" namespace)
-     (yaml/load-as-edn "jitsi/excalidraw-backend-service.yaml")
+     (load-and-adjust-namespace "jitsi/excalidraw-config-deployment.yaml" namespace)]))
-     (cm/replace-all-matching "NAMESPACE" namespace))))
 
 (defn-spec generate-modelector-service cp/map-or-seq?
   [config config?]
@@ -137,13 +136,6 @@
      (yaml/load-as-edn "jitsi/modelector-service.yaml")
      (cm/replace-all-matching "NAMESPACE" namespace))))
 
-(defn-spec generate-excalidraw-deployment cp/map-or-seq?
-  [config config?]
-  (let [{:keys [fqdn namespace]} config]
-    (->
-     (yaml/load-as-edn "jitsi/excalidraw-deployment.yaml")
-     (cm/replace-all-matching "NAMESPACE" namespace))))
-
 (defn-spec generate-modelector-deployment cp/map-or-seq?
   [config config?]
   (let [{:keys [fqdn namespace]} config]

src/main/resources/jitsi/excalidraw-config-deployment.yaml

@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: excalidraw
+  namespace: NAMESPACE
+  labels:
+    app.kubernetes.io/name: excalidraw
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: excalidraw
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: excalidraw
+    spec:
+      containers:
+        - name: excalidraw-backend
+          image: domaindrivenarchitecture/c4k-jitsi-excalidraw-backend

src/main/resources/jitsi/excalidraw-config-service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: excalidraw-backend
+  namespace: NAMESPACE
+  labels:
+    app.kubernetes.io/name: excalidraw  
+spec:
+  ports:
+  - name: excalidraw-backend
+    port: 3002
+    targetPort: 80
+  selector:
+    app.kubernetes.io/name: excalidraw 

src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc

@@ -12,73 +12,7 @@
 (st/instrument `cut/web-config)
 (st/instrument `cut/jvb-config)
 (st/instrument `cut/etherpad-config)
-
+(st/instrument `cut/excalidraw-config)
-(deftest should-generate-excalidraw-backend-service
-  (is (= {:apiVersion "v1",
-          :kind "Service",
-          :metadata
-          {:labels {:service "excalidraw-backend"},
-           :name "excalidraw-backend",
-           :namespace "jitsi"},
-          :spec
-          {:ports [{:name "excalidraw-backend", :port 3002, :targetPort 80}],
-           :selector {:app "excalidraw-backend"}}}
-         (cut/generate-excalidraw-backend-service
-          {:fqdn "xy.xy.xy"
-           :namespace "jitsi"}))))
-
-(deftest should-generate-modelector-service
-  (is (= {:apiVersion "v1",
-          :kind "Service",
-          :metadata
-          {:labels {:service "modelector"},
-           :name "modelector",
-           :namespace "jitsi"},
-          :spec
-          {:ports [{:name "http", :port 80, :targetPort 8080}],
-           :selector {:app "modelector"}}}
-         (cut/generate-modelector-service
-          {:fqdn "xy.xy.xy"
-           :namespace "jitsi"}))))
-
-(deftest should-generate-modelector-deployment
-  (is (= {:apiVersion "apps/v1",
-          :kind "Deployment",
-          :metadata
-          {:labels {:app "modelector"},
-           :name "modelector",
-           :namespace "jitsi"},
-          :spec
-          {:selector {:matchLabels {:app "modelector"}},
-           :replicas 1,
-           :strategy {:type "Recreate"},
-           :template
-           {:metadata {:labels {:app "modelector"}},
-            :spec
-            {:containers
-             [{:name "modelector",
-               :image "domaindrivenarchitecture/moderator-election-vaadin_fullstack",
-               :imagePullPolicy "IfNotPresent",
-               :env
-               [{:name "MEMBERNAMES",
-                 :value "Micha,Ansgar,Erik,Mirco"}]}]}}}}
-          (cut/generate-modelector-deployment
-           {:fqdn "xy.xy.xy"
-            :namespace "jitsi"}))))
-
-(deftest should-generate-excalidraw-deployment
-  (is (= {:apiVersion "v1",
-          :kind "Service",
-          :metadata
-          {:labels {:service "excalidraw-backend"},
-           :name "excalidraw-backend",
-           :namespace "jitsi"},
-          :spec
-          {:ports [{:name "excalidraw-backend", :port 3002, :targetPort 80}],
-           :selector {:app "excalidraw-backend"}}}
-         (cut/generate-excalidraw-backend-service
-          {:fqdn "xy.xy.xy"
-           :namespace "jitsi"}))))
 
 (deftest should-generate-prosody
   (is (= {:apiVersion "v1",
@@ -165,3 +99,9 @@
                  {:fqdn "xy.xy.xy"
                   :namespace "jitsi"})))))
 
+(deftest should-generate-excalidraw
+  (is (= 2
+         (count (cut/excalidraw-config
+                 {:fqdn "xy.xy.xy"
+                  :namespace "jitsi"})))))
+