tests for modelector environment

Reviewed-on: #4

README.md

@@ -1,7 +1,7 @@
 # convention 4 kubernetes: c4k-jitsi
 [![Clojars Project](https://img.shields.io/clojars/v/org.domaindrivenarchitecture/c4k-jitsi.svg)](https://clojars.org/org.domaindrivenarchitecture/c4k-jitsi) [![pipeline status](https://gitlab.com/domaindrivenarchitecture/c4k-jitsi/badges/master/pipeline.svg)](https://gitlab.com/domaindrivenarchitecture/c4k-jitsi/-/commits/main) 
 
-[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa-gmbh.de/img/community/Mastodon_Logotype.svg" width=20 alt="team@social.meissa-gmbh.de"> team@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@team) | [Website & Blog](https://domaindrivenarchitecture.org)
+[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa.de/images/parts/contact/mastodon36_hue9b2464f10b18e134322af482b9c915e_5501_filter_14705073121015236177.png" width=20 alt="M"> meissa@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@meissa) | [Blog](https://domaindrivenarchitecture.org) | [Website](https://meissa.de)
 
 ## Purpose
 
@@ -39,13 +39,14 @@ Development happens at: https://repo.prod.meissa.de/meissa/c4k-jitsi
 
 Mirrors are:
 
-* https://gitlab.com/domaindrivenarchitecture/c4k-jitsi (issues and PR, CI)
+* https://codeberg.org/meissa/c4k-jitsi (Issues and PR)
+* https://gitlab.com/domaindrivenarchitecture/c4k-jitsi (CI)
 * https://github.com/DomainDrivenArchitecture/c4k-jitsi
 
 For more details about our repository model see: https://repo.prod.meissa.de/meissa/federate-your-repos
 
 ## License
 
-Copyright © 2022 meissa GmbH
+Copyright © 2021, 2022, 2023, 2024 meissa GmbH
 Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")
 Pls. find licenses of our subcomponents [here](doc/SUBCOMPONENT_LICENSE)

infrastructure/excalidraw-backend/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-jitsi"
 MODULE = "excalidraw-backend"
 PROJECT_ROOT_PATH = "../.."
-version = "2.1.3"
+version = "2.2.1-dev"
 
 
 @init

infrastructure/excalidraw-backend/image/resources/package-lock.json

@@ -16,7 +16,7 @@
                 "cross-env": "^7.0.3",
                 "debug": "4.3.4",
                 "dotenv": "^16.0.0",
-                "express": "^4.18.2",
+                "express": "^4.19.2",
                 "prom-client": "^15.0.0",
                 "socket.io": "^4.7.2",
                 "ts-node-dev": "^2.0.0",
@@ -1553,20 +1553,21 @@
             "integrity": "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="
         },
         "node_modules/body-parser": {
-            "version": "1.20.1",
+            "version": "1.20.3",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-            "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+            "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+            "license": "MIT",
             "dependencies": {
                 "bytes": "3.1.2",
-                "content-type": "~1.0.4",
+                "content-type": "~1.0.5",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
                 "destroy": "1.2.0",
                 "http-errors": "2.0.0",
                 "iconv-lite": "0.4.24",
                 "on-finished": "2.4.1",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
-                "raw-body": "2.5.1",
+                "raw-body": "2.5.2",
                 "type-is": "~1.6.18",
                 "unpipe": "1.0.0"
             },
@@ -1579,6 +1580,7 @@
             "version": "2.6.9",
             "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
             "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
             "dependencies": {
                 "ms": "2.0.0"
             }
@@ -1586,7 +1588,8 @@
         "node_modules/body-parser/node_modules/ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
         },
         "node_modules/brace-expansion": {
             "version": "1.1.11",
@@ -1675,17 +1678,25 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
             "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.2",
+            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1",
+                "es-define-property": "^1.0.0",
-                "get-intrinsic": "^1.0.2"
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -1819,6 +1830,7 @@
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
             "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1831,9 +1843,10 @@
             "peer": true
         },
         "node_modules/cookie": {
-            "version": "0.5.0",
+            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+            "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1913,17 +1926,20 @@
             "dev": true
         },
         "node_modules/define-data-property": {
-            "version": "1.1.1",
+            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "get-intrinsic": "^1.2.1",
+                "es-define-property": "^1.0.0",
-                "gopd": "^1.0.1",
+                "es-errors": "^1.3.0",
-                "has-property-descriptors": "^1.0.0"
+                "gopd": "^1.0.1"
             },
             "engines": {
                 "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/define-properties": {
@@ -1947,6 +1963,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
             "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -1955,6 +1972,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
             "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8",
                 "npm": "1.2.8000 || >= 1.4.16"
@@ -2014,7 +2032,8 @@
         "node_modules/ee-first": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
             "version": "1.4.560",
@@ -2024,9 +2043,10 @@
             "peer": true
         },
         "node_modules/encodeurl": {
-            "version": "1.0.2",
+            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -2154,6 +2174,27 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "license": "MIT",
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/es-set-tostringtag": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -2207,7 +2248,8 @@
         "node_modules/escape-html": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+            "license": "MIT"
         },
         "node_modules/escape-string-regexp": {
             "version": "1.0.5",
@@ -2708,41 +2750,43 @@
             "version": "1.8.1",
             "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
             "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/express": {
-            "version": "4.18.2",
+            "version": "4.21.1",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+            "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+            "license": "MIT",
             "dependencies": {
                 "accepts": "~1.3.8",
                 "array-flatten": "1.1.1",
-                "body-parser": "1.20.1",
+                "body-parser": "1.20.3",
                 "content-disposition": "0.5.4",
                 "content-type": "~1.0.4",
-                "cookie": "0.5.0",
+                "cookie": "0.7.1",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
+                "finalhandler": "1.3.1",
                 "fresh": "0.5.2",
                 "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
+                "merge-descriptors": "1.0.3",
                 "methods": "~1.1.2",
                 "on-finished": "2.4.1",
                 "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
+                "path-to-regexp": "0.1.10",
                 "proxy-addr": "~2.0.7",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                 "range-parser": "~1.2.1",
                 "safe-buffer": "5.2.1",
-                "send": "0.18.0",
+                "send": "0.19.0",
-                "serve-static": "1.15.0",
+                "serve-static": "1.16.2",
                 "setprototypeof": "1.2.0",
                 "statuses": "2.0.1",
                 "type-is": "~1.6.18",
@@ -2845,12 +2889,13 @@
             }
         },
         "node_modules/finalhandler": {
-            "version": "1.2.0",
+            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+            "license": "MIT",
             "dependencies": {
                 "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "on-finished": "2.4.1",
                 "parseurl": "~1.3.3",
@@ -2865,6 +2910,7 @@
             "version": "2.6.9",
             "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
             "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
             "dependencies": {
                 "ms": "2.0.0"
             }
@@ -2872,7 +2918,8 @@
         "node_modules/finalhandler/node_modules/ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
         },
         "node_modules/find-up": {
             "version": "5.0.0",
@@ -2931,6 +2978,7 @@
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
             "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -2999,14 +3047,19 @@
             }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.2.1",
+            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-            "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1",
+                "es-errors": "^1.3.0",
-                "has": "^1.0.3",
+                "function-bind": "^1.1.2",
                 "has-proto": "^1.0.1",
-                "has-symbols": "^1.0.3"
+                "has-symbols": "^1.0.3",
+                "hasown": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3108,7 +3161,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
             "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-            "dev": true,
             "dependencies": {
                 "get-intrinsic": "^1.1.3"
             },
@@ -3150,12 +3202,12 @@
             }
         },
         "node_modules/has-property-descriptors": {
-            "version": "1.0.0",
+            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "get-intrinsic": "^1.1.1"
+                "es-define-property": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3198,10 +3250,23 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/http-errors": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
             "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "license": "MIT",
             "dependencies": {
                 "depd": "2.0.0",
                 "inherits": "2.0.4",
@@ -3217,6 +3282,7 @@
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
             "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "license": "MIT",
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3"
             },
@@ -3699,14 +3765,19 @@
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
             "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/merge-descriptors": {
-            "version": "1.0.1",
+            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+            "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
         "node_modules/merge2": {
             "version": "1.4.1",
@@ -3742,6 +3813,7 @@
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
             "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "license": "MIT",
             "bin": {
                 "mime": "cli.js"
             },
@@ -3942,6 +4014,7 @@
             "version": "2.4.1",
             "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
             "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "license": "MIT",
             "dependencies": {
                 "ee-first": "1.1.1"
             },
@@ -4020,6 +4093,7 @@
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
             "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4055,9 +4129,10 @@
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
         },
         "node_modules/path-to-regexp": {
-            "version": "0.1.7",
+            "version": "0.1.10",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+            "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+            "license": "MIT"
         },
         "node_modules/path-type": {
             "version": "4.0.0",
@@ -4129,11 +4204,12 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.11.0",
+            "version": "6.13.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.0.6"
             },
             "engines": {
                 "node": ">=0.6"
@@ -4166,14 +4242,16 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
             "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/raw-body": {
-            "version": "2.5.1",
+            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+            "license": "MIT",
             "dependencies": {
                 "bytes": "3.1.2",
                 "http-errors": "2.0.0",
@@ -4339,7 +4417,8 @@
         "node_modules/safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "license": "MIT"
         },
         "node_modules/semver": {
             "version": "6.3.1",
@@ -4351,9 +4430,10 @@
             }
         },
         "node_modules/send": {
-            "version": "0.18.0",
+            "version": "0.19.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+            "license": "MIT",
             "dependencies": {
                 "debug": "2.6.9",
                 "depd": "2.0.0",
@@ -4377,6 +4457,7 @@
             "version": "2.6.9",
             "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
             "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
             "dependencies": {
                 "ms": "2.0.0"
             }
@@ -4384,27 +4465,56 @@
         "node_modules/send/node_modules/debug/node_modules/ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
+        "node_modules/send/node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
         },
         "node_modules/send/node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "license": "MIT"
         },
         "node_modules/serve-static": {
-            "version": "1.15.0",
+            "version": "1.16.2",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+            "license": "MIT",
             "dependencies": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
             },
             "engines": {
                 "node": ">= 0.8.0"
             }
         },
+        "node_modules/set-function-length": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/set-function-name": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
@@ -4422,7 +4532,8 @@
         "node_modules/setprototypeof": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "license": "ISC"
         },
         "node_modules/shebang-command": {
             "version": "2.0.0",
@@ -4444,13 +4555,18 @@
             }
         },
         "node_modules/side-channel": {
-            "version": "1.0.4",
+            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.0",
+                "call-bind": "^1.0.7",
-                "get-intrinsic": "^1.0.2",
+                "es-errors": "^1.3.0",
-                "object-inspect": "^1.9.0"
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -4579,6 +4695,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
             "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4723,6 +4840,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
             "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.6"
             }
@@ -4925,6 +5043,7 @@
             "version": "1.6.18",
             "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
             "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+            "license": "MIT",
             "dependencies": {
                 "media-typer": "0.3.0",
                 "mime-types": "~2.1.24"
@@ -5034,6 +5153,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
             "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8"
             }

infrastructure/web/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-jitsi"
 MODULE = "web"
 PROJECT_ROOT_PATH = "../.."
-version = "2.1.3"
+version = "2.2.1-dev"
 
 
 @init

infrastructure/web/image/Dockerfile

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

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-jitsi",
     "description": "Generate c4k yaml for a jitsi deployment.",
     "author": "meissa GmbH",
-    "version": "2.1.3",
+    "version": "2.2.1-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
     "repository": "https://www.npmjs.com/package/c4k-jitsi",
     "license": "APACHE2",

project.clj

@@ -1,16 +1,17 @@
-(defproject org.domaindrivenarchitecture/c4k-jitsi "2.1.3"
+(defproject org.domaindrivenarchitecture/c4k-jitsi "2.2.1-SNAPSHOT"
   :description "jitsi c4k-installation package"
   :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.12.0"]
-                 [org.clojure/tools.reader "1.4.2"]
+                 [org.clojure/tools.reader "1.5.0"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.3.1"]
+                 [org.domaindrivenarchitecture/c4k-common-clj "8.0.0"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
                  "src/main/clj"]
-  :resource-paths ["src/main/resources"]
+  :resource-paths ["src/main/resources"
+                   "project.clj"]
   :repositories [["snapshots" :clojars]
                  ["releases" :clojars]]
   :deploy-repositories [["snapshots" {:sign-releases false :url "https://clojars.org/repo"}]
@@ -23,9 +24,9 @@
                        :main dda.c4k-jitsi.uberjar
                        :uberjar-name "c4k-jitsi-standalone.jar"
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
-                                      [ch.qos.logback/logback-classic "1.5.6"
+                                      [ch.qos.logback/logback-classic "1.5.12"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.13"]
+                                      [org.slf4j/jcl-over-slf4j "2.0.16"]
                                       [com.github.clj-easy/graal-build-time "1.0.5"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]

shadow-cljs.edn

@@ -4,7 +4,7 @@
                 "src/test/cljc"
                 "src/test/cljs"
                 "src/test/resources"]
- :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.3.1"]
+ :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "8.0.0"]
                 [hickory "0.7.1"]]
  :builds {:frontend {:target :browser
                      :modules {:main {:init-fn dda.c4k-jitsi.browser/init}}

src/main/clj/dda/c4k_jitsi/uberjar.clj

@@ -5,10 +5,11 @@
    [dda.c4k-jitsi.core :as core]))
 
 (defn -main [& cmd-args]
-  (uberjar/main-common
+  (uberjar/main-cm
-   "c4k-jitsi" 
+   "c4k-jitsi"
-   core/config? 
+   core/config?
    core/auth?
-   core/config-defaults 
+   core/config-defaults
-   core/k8s-objects
+   core/config-objects
+   core/auth-objects
    cmd-args))

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

@@ -1,15 +1,16 @@
 (ns dda.c4k-jitsi.core
- (:require
+  (:require
-  [clojure.spec.alpha :as s]
+   [clojure.spec.alpha :as s]
-  #?(:clj [orchestra.core :refer [defn-spec]]
+   #?(:clj [orchestra.core :refer [defn-spec]]
-     :cljs [orchestra.core :refer-macros [defn-spec]])
+      :cljs [orchestra.core :refer-macros [defn-spec]])
-  [dda.c4k-common.common :as cm]
+   [dda.c4k-common.common :as cm]
-  [dda.c4k-common.predicate :as cp]
+   [dda.c4k-common.predicate :as cp]
-  [dda.c4k-common.monitoring :as mon]
+   [dda.c4k-common.monitoring :as mon]
-  [dda.c4k-common.yaml :as yaml]
+   [dda.c4k-common.yaml :as yaml]
-  [dda.c4k-jitsi.jitsi :as jitsi]))
+   [dda.c4k-jitsi.jitsi :as jitsi]
+   [dda.c4k-common.namespace :as ns]))
 
-(def config-defaults {:issuer "staging"})
+(def config-defaults {:issuer "staging", :namespace "jitsi"})
 
 (s/def ::mon-cfg ::mon/mon-cfg)
 (s/def ::mon-auth ::mon/mon-auth)
@@ -23,22 +24,36 @@
                             ::jitsi/jicofo-component-secret]
                    :opt-un [::mon-auth]))
 
-(defn-spec k8s-objects cp/map-or-seq?
+(defn-spec config-objects cp/map-or-seq?
+  [config config?]
+  (map yaml/to-string
+       (filter
+        #(not (nil? %))
+        (cm/concat-vec
+         (ns/generate config)
+         [(jitsi/generate-jvb-service config)
+          (jitsi/generate-web-service config)
+          (jitsi/generate-etherpad-service config)
+          (jitsi/generate-excalidraw-backend-service config)
+          (jitsi/generate-modelector-service config)
+          (jitsi/generate-deployment config)
+          (jitsi/generate-excalidraw-deployment config)
+          (jitsi/generate-modelector-deployment config)]
+         (jitsi/generate-ingress-web config)
+         (jitsi/generate-ingress-etherpad config)
+         (jitsi/generate-ingress-excalidraw-backend config)
+         (jitsi/generate-ingress-modelector config)
+         (when (:contains? config :mon-cfg)
+           (mon/generate-config))))))
+
+(defn-spec auth-objects cp/map-or-seq?
   [config config?
    auth auth?]
   (map yaml/to-string
        (filter
         #(not (nil? %))
         (cm/concat-vec
-         [(jitsi/generate-secret-jitsi auth)
+         [(jitsi/generate-secret-jitsi config auth)]
-          (jitsi/generate-jvb-service)
-          (jitsi/generate-web-service)
-          (jitsi/generate-etherpad-service)
-          (jitsi/generate-excalidraw-backend-service)
-          (jitsi/generate-deployment config)
-          (jitsi/generate-excalidraw-deployment)]
-         (jitsi/generate-ingress-web config)
-         (jitsi/generate-ingress-etherpad config)
-         (jitsi/generate-ingress-excalidraw-backend config)
          (when (:contains? config :mon-cfg)
-           (mon/generate (:mon-cfg config) (:mon-auth auth)))))))
+           (mon/generate-auth (:mon-cfg config) (:mon-auth auth)))))))
+

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

@@ -12,12 +12,14 @@
 
 (s/def ::fqdn cp/fqdn-string?)
 (s/def ::issuer cp/letsencrypt-issuer?)
+(s/def ::namespace string?)
 (s/def ::jvb-auth-password cp/bash-env-string?)
 (s/def ::jicofo-auth-password cp/bash-env-string?)
 (s/def ::jicofo-component-secret cp/bash-env-string?)
 
 (def config? (s/keys :req-un [::fqdn]
-                     :opt-un [::issuer]))
+                     :opt-un [::issuer
+                              ::namespace]))
 
 (def auth? (s/keys :req-un [::jvb-auth-password
                             ::jicofo-auth-password
@@ -53,37 +55,85 @@
      :fqdns [(str "excalidraw-backend." (:fqdn config))]}
     config)))
 
+(defn-spec generate-ingress-modelector cp/map-or-seq?
+  [config config?]
+  (ing/generate-ingress-and-cert
+   (merge
+    {:service-name "modelector"
+     :service-port 80
+     :fqdns [(str "modelector." (:fqdn config))]}
+    config)))
+
 (defn-spec generate-secret-jitsi cp/map-or-seq?
-  [auth auth?]
+  [config config?
-  (let [{:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
+   auth auth?]
+  (let [{:keys [namespace]} config
+        {:keys [jvb-auth-password jicofo-auth-password jicofo-component-secret]} auth]
     (->
      (yaml/from-string (yaml/load-resource "jitsi/secret.yaml"))
+     (cm/replace-all-matching "NAMESPACE" namespace)
      (cm/replace-key-value :JVB_AUTH_PASSWORD (b64/encode jvb-auth-password))
      (cm/replace-key-value :JICOFO_AUTH_PASSWORD (b64/encode jicofo-auth-password))
      (cm/replace-key-value :JICOFO_COMPONENT_SECRET (b64/encode jicofo-component-secret)))))
 
-(defn-spec generate-jvb-service cp/map-or-seq? []
+(defn-spec generate-jvb-service cp/map-or-seq? 
-  (yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml")))
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml"))
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
-(defn-spec generate-web-service cp/map-or-seq? []
+(defn-spec generate-web-service cp/map-or-seq?
-  (yaml/load-as-edn "jitsi/web-service.yaml"))
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/load-as-edn "jitsi/web-service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
-(defn-spec generate-etherpad-service cp/map-or-seq? []
+(defn-spec generate-etherpad-service cp/map-or-seq?
-  (yaml/load-as-edn "jitsi/etherpad-service.yaml"))
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/load-as-edn "jitsi/etherpad-service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
-(defn-spec generate-excalidraw-backend-service cp/map-or-seq? []
+(defn-spec generate-excalidraw-backend-service cp/map-or-seq?
-  (yaml/load-as-edn "jitsi/excalidraw-backend-service.yaml"))
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/load-as-edn "jitsi/excalidraw-backend-service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
+
+(defn-spec generate-modelector-service cp/map-or-seq?
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/load-as-edn "jitsi/modelector-service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
 (defn-spec generate-deployment cp/map-or-seq?
   [config config?]
-  (let [{:keys [fqdn]} config]
+  (let [{:keys [fqdn namespace]} config]
     (->
      (yaml/load-as-edn "jitsi/deployment.yaml")
      (cm/replace-all-matching "REPLACE_JITSI_FQDN" fqdn)
+     (cm/replace-all-matching "NAMESPACE" namespace)
      (cm/replace-all-matching "REPLACE_ETHERPAD_URL"
                               (str "https://etherpad." fqdn "/p/"))
+     
      (cm/replace-all-matching "REPLACE_EXCALIDRAW_BACKEND_URL"
                               (str "https://excalidraw-backend." fqdn)))))
 
-(defn-spec generate-excalidraw-deployment cp/map-or-seq? []
+(defn-spec generate-excalidraw-deployment cp/map-or-seq?
-  (yaml/load-as-edn "jitsi/excalidraw-deployment.yaml"))
+  [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]
+    (->
+     (yaml/load-as-edn "jitsi/modelector-deployment.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))

src/main/resources/jitsi/deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     app: jitsi
   name: jitsi
+  namespace: NAMESPACE
 spec:
   strategy:
     type: Recreate
@@ -17,7 +18,7 @@ spec:
     spec:
       containers:
         - name: jicofo
-          image: jitsi/jicofo:stable-9457-2
+          image: jitsi/jicofo:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: XMPP_SERVER
@@ -37,7 +38,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: prosody
-          image: jitsi/prosody:stable-9457-2
+          image: jitsi/prosody:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -104,7 +105,7 @@ spec:
             - name: COLIBRI_WEBSOCKET_REGEX
               value: "127.0.0.1"
         - name: jvb
-          image: jitsi/jvb:stable-9457-2
+          image: jitsi/jvb:stable-9646
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL

src/main/resources/jitsi/etherpad-service.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     service: etherpad
   name: etherpad
+  namespace: NAMESPACE
 spec:
   ports:
   - name: etherpad

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

@@ -4,6 +4,7 @@ metadata:
   labels:
     service: excalidraw-backend
   name: excalidraw-backend
+  namespace: NAMESPACE
 spec:
   ports:
   - name: excalidraw-backend

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

@@ -4,6 +4,7 @@ metadata:
   labels:
     app: excalidraw-backend
   name: excalidraw-backend
+  namespace: NAMESPACE
 spec:
   strategy:
     type: Recreate

src/main/resources/jitsi/jvb-service.yaml

@@ -7,6 +7,7 @@ metadata:
     metallb.universe.tf/allow-shared-ip: "shared-ip-service-group"
     metallb.universe.tf/address-pool: public
   name: jvb-udp
+  namespace: NAMESPACE
 spec:
   type: LoadBalancer
   ports:

src/main/resources/jitsi/modelector-deployment.yaml

@@ -0,0 +1,26 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: modelector
+  name: modelector
+  namespace: NAMESPACE
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: modelector
+  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"

src/main/resources/jitsi/modelector-service.yaml

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

src/main/resources/jitsi/secret.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: jitsi-config
+  namespace: NAMESPACE
 type: Opaque
 data:
   JVB_AUTH_PASSWORD: "jvb-auth"

src/main/resources/jitsi/web-service.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     service: web
   name: web
+  namespace: NAMESPACE
 spec:
   ports:
   - name: "http"

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

@@ -5,12 +5,18 @@
    [clojure.spec.test.alpha :as st]
    [dda.c4k-jitsi.jitsi :as cut]))
 
-(st/instrument)
+(st/instrument `cut/generate-deployment)
+(st/instrument `cut/generate-secret-jitsi)
+(st/instrument `cut/generate-ingress-web)
+(st/instrument `cut/generate-jvb-service)
 
 (deftest should-generate-deployment
   (is (= {:apiVersion "apps/v1",
           :kind "Deployment",
-          :metadata {:labels {:app "jitsi"}, :name "jitsi"},
+          :metadata
+          {:labels {:app "jitsi"},
+           :name "jitsi"
+           :namespace "jitsi"},
           :spec
           {:strategy {:type "Recreate"},
            :selector {:matchLabels {:app "jitsi"}},
@@ -19,7 +25,7 @@
             :spec
             {:containers
              [{:name "jicofo",
-               :image "jitsi/jicofo:stable-9457-2",
+               :image "jitsi/jicofo:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
@@ -29,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-9457-2",
+               :image "jitsi/prosody:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -63,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-9457-2",
+               :image "jitsi/jvb:stable-9646",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -85,17 +91,210 @@
                 {:name "JICOFO_AUTH_USER", :value "focus"}
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}]}}}}
-         (cut/generate-deployment {:fqdn "xy.xy.xy"}))))
+         (cut/generate-deployment {:fqdn "xy.xy.xy"
+                                   :namespace "jitsi"}))))
 
 (deftest should-generate-secret
   (is (= {:apiVersion "v1",
           :kind "Secret",
-          :metadata {:name "jitsi-config"},
+          :metadata 
+          {:name "jitsi-config"
+           :namespace "jitsi"},
           :type "Opaque",
           :data
           {:JVB_AUTH_PASSWORD "anZiLWF1dGg=",
            :JICOFO_AUTH_PASSWORD "amljb2ZvLWF1dGg=",
            :JICOFO_COMPONENT_SECRET "amljb2ZvLWNvbXA="}}
-         (cut/generate-secret-jitsi {:jvb-auth-password "jvb-auth"
+         (cut/generate-secret-jitsi 
-                                     :jicofo-auth-password "jicofo-auth"
+          {:fqdn "xy.xy.xy"
-                                     :jicofo-component-secret "jicofo-comp"}))))
+           :namespace "jitsi"}
+          {:jvb-auth-password "jvb-auth"
+           :jicofo-auth-password "jicofo-auth"
+           :jicofo-component-secret "jicofo-comp"}))))
+                                                        
+  (deftest should-generate-ingress-web
+    (is (= [{:apiVersion "cert-manager.io/v1",
+            :kind "Certificate",
+            :metadata
+            {:name "web",
+             :labels {:app.kubernetes.part-of "web"},
+             :namespace "jitsi"},
+            :spec
+            {:secretName "web",
+             :commonName "xy.xy.xy",
+             :duration "2160h",
+             :renewBefore "720h",
+             :dnsNames ["xy.xy.xy"],
+             :issuerRef {:name "staging", :kind "ClusterIssuer"}}}
+           {:apiVersion "networking.k8s.io/v1",
+            :kind "Ingress",
+            :metadata
+            {:namespace "jitsi",
+             :annotations
+             {:traefik.ingress.kubernetes.io/router.entrypoints "web, websecure",
+              :traefik.ingress.kubernetes.io/router.middlewares
+              "default-redirect-https@kubernetescrd",
+              :metallb.universe.tf/address-pool "public"},
+             :name "web",
+             :labels {:app.kubernetes.part-of "web"}},
+            :spec
+            {:tls [{:hosts ["xy.xy.xy"], :secretName "web"}],
+             :rules
+             [{:host "xy.xy.xy",
+               :http
+               {:paths
+                [{:pathType "Prefix",
+                  :path "/",
+                  :backend {:service {:name "web", :port {:number 80}}}}]}}]}}]
+           (cut/generate-ingress-web
+            {:fqdn "xy.xy.xy"
+             :namespace "jitsi"}))))
+
+(deftest should-generate-ingress-modelector
+  (is (= [{:apiVersion "cert-manager.io/v1",
+           :kind "Certificate",
+           :metadata
+           {:name "modelector",
+            :labels {:app.kubernetes.part-of "modelector"},
+            :namespace "jitsi"},
+           :spec
+           {:secretName "modelector",
+            :commonName "modelector.xy.xy",
+            :duration "2160h",
+            :renewBefore "720h",
+            :dnsNames ["modelector.xy.xy"],
+            :issuerRef {:name "staging", :kind "ClusterIssuer"}}}
+          {:apiVersion "networking.k8s.io/v1",
+           :kind "Ingress",
+           :metadata
+           {:namespace "jitsi",
+            :annotations
+            {:traefik.ingress.kubernetes.io/router.entrypoints "web, websecure",
+             :traefik.ingress.kubernetes.io/router.middlewares
+             "default-redirect-https@kubernetescrd",
+             :metallb.universe.tf/address-pool "public"},
+            :name "modelector",
+            :labels {:app.kubernetes.part-of "modelector"}},
+           :spec
+           {:tls [{:hosts ["modelector.xy.xy"], :secretName "modelector"}],
+            :rules
+            [{:host "modelector.xy.xy",
+              :http
+              {:paths
+               [{:pathType "Prefix",
+                 :path "/",
+                 :backend {:service {:name "modelector", :port {:number 80}}}}]}}]}}]
+         (cut/generate-ingress-modelector
+          {:fqdn "xy.xy"
+           :namespace "jitsi"}))))
+
+(deftest should-generate-jvb-service
+  (is (= {:apiVersion "v1",
+          :kind "Service",
+          :metadata
+          {:labels {:service "jvb"},
+           :annotations
+           #:metallb.universe.tf{:allow-shared-ip "shared-ip-service-group",
+                                 :address-pool "public"},
+           :name "jvb-udp"
+           :namespace "jitsi"},
+          :spec
+          {:type "LoadBalancer",
+           :ports
+           [{:port 30300, :protocol "UDP", :targetPort 30300, :nodePort 30300}],
+           :selector {:app "jitsi"}}}
+         (cut/generate-jvb-service
+          {:fqdn "xy.xy.xy"
+           :namespace "jitsi"}))))
+
+(deftest should-generate-web-service
+  (is (= {:apiVersion "v1",
+          :kind "Service",
+          :metadata {:labels {:service "web"}, :name "web", :namespace "jitsi"},
+          :spec
+          {:ports
+           [{:name "http", :port 80, :targetPort 80}
+            {:name "https", :port 443, :targetPort 443}],
+           :selector {:app "jitsi"}}}
+         (cut/generate-web-service
+          {:fqdn "xy.xy.xy"
+           :namespace "jitsi"}))))
+
+(deftest should-generate-etherpad-service
+  (is (= {:apiVersion "v1",
+          :kind "Service",
+          :metadata
+          {:labels {:service "etherpad"}, :name "etherpad", :namespace "jitsi"},
+          :spec
+          {:ports [{:name "etherpad", :port 9001, :targetPort 9001}],
+           :selector {:app "jitsi"}}}
+         (cut/generate-etherpad-service
+          {:fqdn "xy.xy.xy"
+           :namespace "jitsi"}))))
+
+(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"}))))