[skip ci] Remove unnecessary service for meapp, change tests to that, jitsi version to 9646, rise clojars mods versions after pyb lint

infrastructure/web/image/Dockerfile

@@ -1,5 +1,5 @@
 # IMPORTANT: In case of base image update, "./resources/settings-config.js" also has to be updated manually!
-FROM jitsi/web:stable-9584-1
+FROM jitsi/web:stable-9646
 
 # Prepare Configuration
 ADD resources /tmp

project.clj

@@ -3,7 +3,7 @@
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
-  :dependencies [[org.clojure/clojure "1.11.3"]
+  :dependencies [[org.clojure/clojure "1.11.4"]
                  [org.clojure/tools.reader "1.4.2"]
                  [org.domaindrivenarchitecture/c4k-common-clj "8.0.0"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
@@ -25,7 +25,7 @@
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
                                       [ch.qos.logback/logback-classic "1.5.6"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.13"]
+                                      [org.slf4j/jcl-over-slf4j "2.0.14"]
                                       [com.github.clj-easy/graal-build-time "1.0.5"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]

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

@@ -35,7 +35,6 @@
           (jitsi/generate-web-service config)
           (jitsi/generate-etherpad-service config)
           (jitsi/generate-excalidraw-backend-service config)
-          (jitsi/generate-meapp-fullstack-service config)
           (jitsi/generate-deployment config)
           (jitsi/generate-excalidraw-deployment config)
           (jitsi/generate-meapp-deployment config)]

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

@@ -104,13 +104,6 @@
      (yaml/load-as-edn "jitsi/excalidraw-backend-service.yaml")
      (cm/replace-all-matching "NAMESPACE" namespace))))
 
-(defn-spec generate-meapp-fullstack-service cp/map-or-seq?
-  [config config?]
-  (let [{:keys [namespace]} config]
-    (->
-     (yaml/load-as-edn "jitsi/meapp-fullstack-service.yaml")
-     (cm/replace-all-matching "NAMESPACE" namespace))))
-
 (defn-spec generate-deployment cp/map-or-seq?
   [config config?]
   (let [{:keys [fqdn namespace]} config]

src/main/resources/jitsi/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: jicofo
-          image: jitsi/jicofo:stable-9584-1
+          image: jitsi/jicofo:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: XMPP_SERVER
@@ -38,7 +38,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: prosody
-          image: jitsi/prosody:stable-9584-1
+          image: jitsi/prosody:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -105,7 +105,7 @@ spec:
             - name: COLIBRI_WEBSOCKET_REGEX
               value: "127.0.0.1"
         - name: jvb
-          image: jitsi/jvb:stable-9584-1
+          image: jitsi/jvb:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL

src/main/resources/jitsi/meapp-fullstack-service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    service: meapp-fullstack
-  name: meapp-fullstack
-  namespace: NAMESPACE
-spec:
-  ports:
-    - name: "http"
-      port: 80
-      targetPort: 8080
-  selector:
-    app: meapp-fullstack

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

@@ -25,7 +25,7 @@
             :spec
             {:containers
              [{:name "jicofo",
-               :image "jitsi/jicofo:stable-9584-1",
+               :image "jitsi/jicofo:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
@@ -35,7 +35,7 @@
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "prosody",
-               :image "jitsi/prosody:stable-9584-1",
+               :image "jitsi/prosody:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -69,7 +69,7 @@
                 {:name "WHITEBOARD_COLLAB_SERVER_PUBLIC_URL", :value "https://excalidraw-backend.xy.xy.xy"}
                 {:name "COLIBRI_WEBSOCKET_REGEX", :value "127.0.0.1"}]}
               {:name "jvb",
-               :image "jitsi/jvb:stable-9584-1",
+               :image "jitsi/jvb:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -208,20 +208,6 @@
           {:fqdn "xy.xy.xy"
            :namespace "jitsi"}))))
 
-(deftest should-generate-meapp-fullstack-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-excalidraw-deployment
   (is (= {:apiVersion "v1",
           :kind "Service",