From 0791f58211f7ede5cc4844c4fe6d27fa3ebd9b9a Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Wed, 15 Jan 2025 14:47:55 +0300
Subject: [PATCH 01/13] refactor(images): Update image tags to get the latest
versions
---
charts/opendesk-jitsi/values.yaml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 305390f..2a2a633 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -221,7 +221,7 @@ jitsi:
web:
replicaCount: 1
image:
- tag: "stable-9823@sha256:1cb2c7eb8b65abedfafb1db66c1beedbba43b208649fbf090b4ed81128dbc115"
+ tag: "stable-9955@sha256:23458904c9e9ff391df42567a3e667710754c584ab77db7abfe432a6ebd0fcec"
pullPolicy: "IfNotPresent"
extraConfigJs:
doNotStoreRoom: false
@@ -326,7 +326,7 @@ jitsi:
type: "RuntimeDefault"
prosody:
image:
- tag: "stable-9823@sha256:7e68fb1c670efaaa3221040db431e447474f48964f6a3131fafa09433f2c67c0"
+ tag: "stable-9955@sha256:27d5f83b1989a7fc699e40f16b1d97e45be5c22507dc5e56eca59f80f106e385"
pullPolicy: "IfNotPresent"
extraEnvs:
- name: "AUTH_TYPE"
@@ -342,7 +342,7 @@ jitsi:
jicofo:
image:
- tag: "stable-9823@sha256:a8b7179010924e0a9da965478b1dd67570af87a79c49da184c43de2911cc9e64"
+ tag: "stable-9955@sha256:473e7994018d61d29cf296ef6bca03c6ac71ae697a15e3ecff5d39cc569e7a39"
pullPolicy: "IfNotPresent"
extraEnvs:
AUTH_TYPE: "xmpp"
@@ -366,7 +366,7 @@ jitsi:
jvb:
image:
- tag: "stable-9823@sha256:9ae3deb1b89d80b9056ead1cac90fd47c700d6da77a5d3eb7a6c1d76bd5b9588"
+ tag: "stable-9955@sha256:9f57b4bd09a94e68a57bba6c30070cca801cd8e9466e31bc7361e081cc625980"
pullPolicy: "IfNotPresent"
replicaCount: 1
service:
@@ -385,7 +385,7 @@ jitsi:
recording: true
livestreaming: true
image:
- tag: "stable-9823@sha256:986535ff3e1e66fcfa8b58b0e99ef4c4f7dce10400223b33e7056f7c68f6f15b"
+ tag: "stable-9955@sha256:893ea6eca8966dccea5d3e6745b2f8aae7f2906cb995ebe798a63e6e52b00c93"
pullPolicy: "IfNotPresent"
readinessProbe:
initialDelaySeconds: 15
--
GitLab
From 34e2964d71fa28c2e1ace054a2ead7e17e1b1db4 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Wed, 15 Jan 2025 15:27:03 +0300
Subject: [PATCH 02/13] refactor(images): Update jitsi-keycloak-adapter tag to
get the latest versions
---
charts/opendesk-jitsi/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 2a2a633..a004084 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -113,7 +113,7 @@ image:
imagePullPolicy: "IfNotPresent"
# -- Define image tag.
- tag: "v20241023@sha256:2391799c5168222f0e3ebb94d7c3cb3bcea6f075399458197f0c1bbbb8f293fe"
+ tag: "v20250115@sha256:86f3e56d28bff6043fb84e0238922ea766f38416150ca4742cd3ef8112fbb10f"
# After deployment of JVB service, the job fetches the provisioned LoadBalancer IP or NodePort port to advertise.
--
GitLab
From d1fbb093fd4d747d583604cabee3299b75f98db5 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Wed, 15 Jan 2025 17:40:45 +0300
Subject: [PATCH 03/13] chore(git): Add vim swap files into gitignore
---
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitignore b/.gitignore
index b481bd4..213cd87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@ Chart.lock
# IDE
.idea
+
+# Editor
+*~
+*.sw?
--
GitLab
From a3fda348c0ef6eae192367064a769acc220abd37 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Wed, 15 Jan 2025 17:41:40 +0300
Subject: [PATCH 04/13] feat(images): Add Jigasi into values.yaml
---
charts/opendesk-jitsi/values.yaml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index a004084..885d762 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -406,6 +406,18 @@ jitsi:
useHost: false
size: "2Gi"
+ jigasi:
+ enabled: true
+ image:
+ tag: "stable-9955@sha256:4ae9592e8e12ff5cf97f12d0895f231eeb82b9348d8a4b01fb0caea6a48d8efa"
+ pullPolicy: "IfNotPresent"
+ securityContext:
+ allowPrivilegeEscalation: false
+ seccompProfile:
+ type: "RuntimeDefault"
+ readOnlyRootFilesystem: false
+ runAsNonRoot: false
+
extraCommonEnvs:
ADAPTER_INTERNAL_URL: "http://jitsi-keycloak-adapter:9000"
TOOLBAR_BUTTONS: "camera,chat,closedcaptions,desktop,download,feedback,filmstrip,fullscreen,hangup,help,\
--
GitLab
From e897be8ccd708a769565a33d82f42f2156cfdb79 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Thu, 16 Jan 2025 19:45:22 +0300
Subject: [PATCH 05/13] feat(dialin): Set related env and generated related
config files
---
.../files/web/dialin-phone-numbers.json | 14 ++++++++++++++
charts/opendesk-jitsi/templates/configmap.yaml | 1 +
charts/opendesk-jitsi/values.yaml | 11 +++++++++++
3 files changed, 26 insertions(+)
create mode 100644 charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
diff --git a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
new file mode 100644
index 0000000..7ec6f93
--- /dev/null
+++ b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
@@ -0,0 +1,14 @@
+[
+ {{- $countryCode := .Values.jitsi.web.extraConfigJs.dialinCountryCode }}
+ {{- $list := .Values.jitsi.web.extraConfigJs.dialinPhoneNumbers | default "" | split "," }}
+ {{- $len := len $list }}
+ {{- $i := 1 }}
+ {{- range $key, $phone := $list }}
+ {
+ "countryCode":"{{ $countryCode }}",
+ "tollFree":false,
+ "formattedNumber":"{{ $phone }}"
+ }{{ if lt $i $len }},{{ end }}
+ {{- $i = add $i 1 }}
+ {{- end }}
+]
diff --git a/charts/opendesk-jitsi/templates/configmap.yaml b/charts/opendesk-jitsi/templates/configmap.yaml
index 9a88f5d..0568937 100644
--- a/charts/opendesk-jitsi/templates/configmap.yaml
+++ b/charts/opendesk-jitsi/templates/configmap.yaml
@@ -25,6 +25,7 @@ data:
{{ tpl ((.Files.Glob "files/web/branding.json").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/custom-config.js").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/custom-interface_config.js").AsConfig) . | nindent 2 }}
+{{ tpl ((.Files.Glob "files/web/dialin-phone-numbers.json").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/plugin.head.html").AsConfig) . | nindent 2 }}
---
kind: "ConfigMap"
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 885d762..ef1a09d 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -225,8 +225,14 @@ jitsi:
pullPolicy: "IfNotPresent"
extraConfigJs:
doNotStoreRoom: false
+ dialinCountryCode: "DE"
+ dialinPhoneNumbers: ""
extraEnvs:
COLIBRI_WEBSOCKET_REGEX: "[a-z0-9._-]+"
+ # This value will be replace with internal conference mapper when it is
+ # ready.
+ CONFCODE_URL: "https://jitsi-api.jitsi.net/conferenceMapper"
+ DIALIN_NUMBERS_URL: "/static/dialin-phone-numbers.json"
extraVolumes:
- name: "jitsi-meet-files"
configMap:
@@ -240,6 +246,8 @@ jitsi:
path: "custom-config.js"
- key: "custom-interface_config.js"
path: "custom-interface_config.js"
+ - key: "dialin-phone-numbers.json"
+ path: "dialin-phone-numbers.json"
- key: "favicon.svg"
path: "favicon.svg"
- key: "lang-overwritten-de.json"
@@ -294,6 +302,9 @@ jitsi:
- name: "jitsi-meet-files"
subPath: "branding.json"
mountPath: "/usr/share/jitsi-meet/static/branding.json"
+ - name: "jitsi-meet-files"
+ subPath: "dialin-phone-numbers.json"
+ mountPath: "/usr/share/jitsi-meet/static/dialin-phone-numbers.json"
- name: "jitsi-meet-files"
subPath: "lang-overwritten-de.json"
mountPath: "/usr/share/jitsi-meet/static/lang-overwritten-de.json"
--
GitLab
From 2a8dbe38f2ce08a43f3b85f4ddca2f7790f0edba Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Thu, 16 Jan 2025 19:52:03 +0300
Subject: [PATCH 06/13] feat(dialin): Enable the invite button
---
charts/opendesk-jitsi/values.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index ef1a09d..f8c1a42 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -432,8 +432,8 @@ jitsi:
extraCommonEnvs:
ADAPTER_INTERNAL_URL: "http://jitsi-keycloak-adapter:9000"
TOOLBAR_BUTTONS: "camera,chat,closedcaptions,desktop,download,feedback,filmstrip,fullscreen,hangup,help,\
- livestreaming,microphone,mute-everyone,mute-video-everyone,participants-pane,profile,raisehand,security,\
- select-background,settings,shareaudio,shortcuts,stats,tileview,toggle-camera,videoquality"
+ invite,livestreaming,microphone,mute-everyone,mute-video-everyone,participants-pane,profile,raisehand,\
+ security,select-background,settings,shareaudio,shortcuts,stats,tileview,toggle-camera,videoquality"
tz: "Europe/Berlin"
--
GitLab
From 9857aff87d4a4297c9a6d4cf367f52f3788df360 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Fri, 17 Jan 2025 09:23:24 +0300
Subject: [PATCH 07/13] feat(images): Upgrade jitsi-keycloak-adapter for Deno
2.1.6
---
charts/opendesk-jitsi/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index f8c1a42..847d5b9 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -113,7 +113,7 @@ image:
imagePullPolicy: "IfNotPresent"
# -- Define image tag.
- tag: "v20250115@sha256:86f3e56d28bff6043fb84e0238922ea766f38416150ca4742cd3ef8112fbb10f"
+ tag: "v20250117@sha256:254025cb03a05a1eba5971a1f07f13a4148c4ac8538a7e7c79fbd4b86e2f2cd5"
# After deployment of JVB service, the job fetches the provisioned LoadBalancer IP or NodePort port to advertise.
--
GitLab
From 80e77f4e352eb9b92877b4d8b3ebe1fea27f086b Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Fri, 17 Jan 2025 12:33:54 +0300
Subject: [PATCH 08/13] refactor(files): copyright into json files
---
charts/opendesk-jitsi/files/web/branding.json | 5 +++++
charts/opendesk-jitsi/files/web/dialin-phone-numbers.json | 5 +++++
charts/opendesk-jitsi/files/web/lang-overwritten-de.json | 5 +++++
charts/opendesk-jitsi/files/web/lang-overwritten-en.json | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/charts/opendesk-jitsi/files/web/branding.json b/charts/opendesk-jitsi/files/web/branding.json
index c722bc8..a323411 100644
--- a/charts/opendesk-jitsi/files/web/branding.json
+++ b/charts/opendesk-jitsi/files/web/branding.json
@@ -1,3 +1,8 @@
+{{- /*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
{
"_comment": [
"See the following link for advanced branding:",
diff --git a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
index 7ec6f93..fc2d743 100644
--- a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
+++ b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
@@ -1,3 +1,8 @@
+{{- /*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
[
{{- $countryCode := .Values.jitsi.web.extraConfigJs.dialinCountryCode }}
{{- $list := .Values.jitsi.web.extraConfigJs.dialinPhoneNumbers | default "" | split "," }}
diff --git a/charts/opendesk-jitsi/files/web/lang-overwritten-de.json b/charts/opendesk-jitsi/files/web/lang-overwritten-de.json
index 6673096..d5d982c 100644
--- a/charts/opendesk-jitsi/files/web/lang-overwritten-de.json
+++ b/charts/opendesk-jitsi/files/web/lang-overwritten-de.json
@@ -1,3 +1,8 @@
+{{- /*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
{
"_comment": [
"Overwritten labels. See the following link for possible options:",
diff --git a/charts/opendesk-jitsi/files/web/lang-overwritten-en.json b/charts/opendesk-jitsi/files/web/lang-overwritten-en.json
index 0044c91..7ff9c47 100644
--- a/charts/opendesk-jitsi/files/web/lang-overwritten-en.json
+++ b/charts/opendesk-jitsi/files/web/lang-overwritten-en.json
@@ -1,3 +1,8 @@
+{{- /*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
{
"_comment": [
"Overwritten labels. See the following link for possible options:",
--
GitLab
From 0d48d40ba500edf4d737023182c4d6a9903d6a7e Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Fri, 17 Jan 2025 13:52:48 +0300
Subject: [PATCH 09/13] fix(files): generate lang files from templates
---
charts/opendesk-jitsi/templates/configmap.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/opendesk-jitsi/templates/configmap.yaml b/charts/opendesk-jitsi/templates/configmap.yaml
index 0568937..9433ca7 100644
--- a/charts/opendesk-jitsi/templates/configmap.yaml
+++ b/charts/opendesk-jitsi/templates/configmap.yaml
@@ -17,8 +17,6 @@ data:
watermark.svg: |
{{- .Values.theme.imagery.logoHeaderInvertedSvgB64 | b64dec | nindent 4 }}
{{ (.Files.Glob "files/web/body.html").AsConfig | nindent 2 }}
-{{ (.Files.Glob "files/web/lang-overwritten-de.json").AsConfig | nindent 2 }}
-{{ (.Files.Glob "files/web/lang-overwritten-en.json").AsConfig | nindent 2 }}
{{ (.Files.Glob "files/web/meet.oidc.conf").AsConfig | nindent 2 }}
{{ (.Files.Glob "files/web/oidc-adapter.html").AsConfig | nindent 2 }}
{{ (.Files.Glob "files/web/oidc-redirect.html").AsConfig | nindent 2 }}
@@ -26,6 +24,8 @@ data:
{{ tpl ((.Files.Glob "files/web/custom-config.js").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/custom-interface_config.js").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/dialin-phone-numbers.json").AsConfig) . | nindent 2 }}
+{{ tpl ((.Files.Glob "files/web/lang-overwritten-de.json").AsConfig) . | nindent 2 }}
+{{ tpl ((.Files.Glob "files/web/lang-overwritten-en.json").AsConfig) . | nindent 2 }}
{{ tpl ((.Files.Glob "files/web/plugin.head.html").AsConfig) . | nindent 2 }}
---
kind: "ConfigMap"
--
GitLab
From b601735ed62736e429f3d7bea6dd811375ee8e54 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Fri, 17 Jan 2025 14:52:48 +0300
Subject: [PATCH 10/13] refactor(jigasi): Initialize extraEnvs
---
charts/opendesk-jitsi/values.yaml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 847d5b9..1b79ae5 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -229,8 +229,8 @@ jitsi:
dialinPhoneNumbers: ""
extraEnvs:
COLIBRI_WEBSOCKET_REGEX: "[a-z0-9._-]+"
- # This value will be replace with internal conference mapper when it is
- # ready.
+ # This value will be replace with internal conference mapper later when
+ # it is ready.
CONFCODE_URL: "https://jitsi-api.jitsi.net/conferenceMapper"
DIALIN_NUMBERS_URL: "/static/dialin-phone-numbers.json"
extraVolumes:
@@ -422,6 +422,10 @@ jitsi:
image:
tag: "stable-9955@sha256:4ae9592e8e12ff5cf97f12d0895f231eeb82b9348d8a4b01fb0caea6a48d8efa"
pullPolicy: "IfNotPresent"
+ extraEnvs:
+ JIGASI_SIP_DEFAULT_ROOM: "siptest@muc.meet.jitsi"
+ # See https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/blob/main/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
+ # for added extraEnvs during deployment
securityContext:
allowPrivilegeEscalation: false
seccompProfile:
--
GitLab
From a73de0d88fa483a83a963284166a5b01db6ba7f4 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Tue, 21 Jan 2025 13:08:09 +0300
Subject: [PATCH 11/13] refactor(values.yaml): renamed as extraConfig
---
charts/opendesk-jitsi/README.md | 2 +-
charts/opendesk-jitsi/files/web/custom-config.js | 2 +-
charts/opendesk-jitsi/files/web/custom-interface_config.js | 2 +-
charts/opendesk-jitsi/files/web/dialin-phone-numbers.json | 4 ++--
charts/opendesk-jitsi/files/web/plugin.head.html | 2 +-
charts/opendesk-jitsi/values.yaml | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/charts/opendesk-jitsi/README.md b/charts/opendesk-jitsi/README.md
index 532577e..3208ccd 100644
--- a/charts/opendesk-jitsi/README.md
+++ b/charts/opendesk-jitsi/README.md
@@ -115,7 +115,7 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| jitsi.prosody.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
| jitsi.publicURL | string | `"https://jitsi.mydomain.tld"` | |
| jitsi.tz | string | `"Europe/Berlin"` | |
-| jitsi.web.extraConfigJs.doNotStoreRoom | bool | `false` | |
+| jitsi.web.extraConfig.doNotStoreRoom | bool | `false` | |
| jitsi.web.extraEnvs.COLIBRI_WEBSOCKET_REGEX | string | `"[a-z0-9._-]+"` | |
| jitsi.web.extraVolumeMounts[0].mountPath | string | `"/config/custom-config.js"` | |
| jitsi.web.extraVolumeMounts[0].name | string | `"jitsi-meet-files"` | |
diff --git a/charts/opendesk-jitsi/files/web/custom-config.js b/charts/opendesk-jitsi/files/web/custom-config.js
index 4fb8dab..41fc38c 100644
--- a/charts/opendesk-jitsi/files/web/custom-config.js
+++ b/charts/opendesk-jitsi/files/web/custom-config.js
@@ -7,5 +7,5 @@ config.disabledNotifications = [
config.disabledSounds = [
"INCOMING_MSG_SOUND",
];
-config.doNotStoreRoom = {{ .Values.jitsi.web.extraConfigJs.doNotStoreRoom }};
+config.doNotStoreRoom = {{ .Values.jitsi.web.extraConfig.doNotStoreRoom }};
config.dynamicBrandingUrl = "/static/branding.json";
diff --git a/charts/opendesk-jitsi/files/web/custom-interface_config.js b/charts/opendesk-jitsi/files/web/custom-interface_config.js
index e546e08..d96285f 100644
--- a/charts/opendesk-jitsi/files/web/custom-interface_config.js
+++ b/charts/opendesk-jitsi/files/web/custom-interface_config.js
@@ -11,7 +11,7 @@ interfaceConfig.DISPLAY_WELCOME_FOOTER = false;
interfaceConfig.ENABLE_DIAL_OUT = false;
interfaceConfig.GENERATE_ROOMNAMES_ON_WELCOME_PAGE = true;
interfaceConfig.RECENT_LIST_ENABLED =
- {{ not .Values.jitsi.web.extraConfigJs.doNotStoreRoom }};
+ {{ not .Values.jitsi.web.extraConfig.doNotStoreRoom }};
interfaceConfig.SHOW_JITSI_WATERMARK = true;
interfaceConfig.JITSI_WATERMARK_LINK =
"https://{{ .Values.global.hosts.nubus }}.{{ .Values.global.domain }}";
diff --git a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
index fc2d743..065a651 100644
--- a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
+++ b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json
@@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
SPDX-License-Identifier: Apache-2.0
*/}}
[
- {{- $countryCode := .Values.jitsi.web.extraConfigJs.dialinCountryCode }}
- {{- $list := .Values.jitsi.web.extraConfigJs.dialinPhoneNumbers | default "" | split "," }}
+ {{- $countryCode := .Values.jitsi.web.extraConfig.dialinCountryCode }}
+ {{- $list := .Values.jitsi.web.extraConfig.dialinPhoneNumbers | default "" | split "," }}
{{- $len := len $list }}
{{- $i := 1 }}
{{- range $key, $phone := $list }}
diff --git a/charts/opendesk-jitsi/files/web/plugin.head.html b/charts/opendesk-jitsi/files/web/plugin.head.html
index 9e3feec..8635ef3 100644
--- a/charts/opendesk-jitsi/files/web/plugin.head.html
+++ b/charts/opendesk-jitsi/files/web/plugin.head.html
@@ -69,7 +69,7 @@ SPDX-License-Identifier: Apache-2.0
}
/* Set a border color for the recent meeting list if it is enabled */
- {{ if not .Values.jitsi.web.extraConfigJs.doNotStoreRoom }}
+ {{ if not .Values.jitsi.web.extraConfig.doNotStoreRoom }}
.welcome .welcome-card--blue {
background: unset;
border-color: {{ .Values.theme.colors.primary }};
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 1b79ae5..7a9e6f1 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -223,7 +223,7 @@ jitsi:
image:
tag: "stable-9955@sha256:23458904c9e9ff391df42567a3e667710754c584ab77db7abfe432a6ebd0fcec"
pullPolicy: "IfNotPresent"
- extraConfigJs:
+ extraConfig:
doNotStoreRoom: false
dialinCountryCode: "DE"
dialinPhoneNumbers: ""
--
GitLab
From fe23138310fd2f394c4281c3f4fdae20708fc342 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Tue, 21 Jan 2025 14:08:15 +0300
Subject: [PATCH 12/13] docs(readme): Update parameters info
---
charts/opendesk-jitsi/README.md | 68 ++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 27 deletions(-)
diff --git a/charts/opendesk-jitsi/README.md b/charts/opendesk-jitsi/README.md
index 3208ccd..eba9c5c 100644
--- a/charts/opendesk-jitsi/README.md
+++ b/charts/opendesk-jitsi/README.md
@@ -58,15 +58,15 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| image.imagePullPolicy | string | `"IfNotPresent"` | Define an ImagePullPolicy. Ref.: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy "IfNotPresent" => The image is pulled only if it is not already present locally. "Always" => Every time the kubelet launches a container, the kubelet queries the container image registry to resolve the name to an image digest. If the kubelet has a container image with that exact digest cached locally, the kubelet uses its cached image; otherwise, the kubelet pulls the image with the resolved digest, and uses that image to launch the container. "Never" => The kubelet does not try fetching the image. If the image is somehow already present locally, the kubelet attempts to start the container; otherwise, startup fails |
| image.registry | string | `"ghcr.io"` | Container registry address. This setting has higher precedence than global.registry. |
| image.repository | string | `"nordeck/jitsi-keycloak-adapter"` | Container repository string. |
-| image.tag | string | `"v20241023@sha256:2391799c5168222f0e3ebb94d7c3cb3bcea6f075399458197f0c1bbbb8f293fe"` | Define image tag. |
+| image.tag | string | `"v20250117@sha256:254025cb03a05a1eba5971a1f07f13a4148c4ac8538a7e7c79fbd4b86e2f2cd5"` | Define image tag. |
| imagePullSecrets | list | `[]` | Credentials to fetch images from private registry Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ imagePullSecrets: - "docker-registry" |
| jitsi.enableAuth | bool | `true` | |
| jitsi.enableGuests | bool | `true` | |
| jitsi.extraCommonEnvs.ADAPTER_INTERNAL_URL | string | `"http://jitsi-keycloak-adapter:9000"` | |
-| jitsi.extraCommonEnvs.TOOLBAR_BUTTONS | string | `"camera,chat,closedcaptions,desktop,download,feedback,filmstrip,fullscreen,hangup,help,livestreaming,microphone,mute-everyone,mute-video-everyone,participants-pane,profile,raisehand,security,select-background,settings,shareaudio,shortcuts,stats,tileview,toggle-camera,videoquality"` | |
+| jitsi.extraCommonEnvs.TOOLBAR_BUTTONS | string | `"camera,chat,closedcaptions,desktop,download,feedback,filmstrip,fullscreen,hangup,help,invite,livestreaming,microphone,mute-everyone,mute-video-everyone,participants-pane,profile,raisehand,security,select-background,settings,shareaudio,shortcuts,stats,tileview,toggle-camera,videoquality"` | |
| jitsi.jibri.enabled | bool | `true` | |
| jitsi.jibri.image.pullPolicy | string | `"IfNotPresent"` | |
-| jitsi.jibri.image.tag | string | `"stable-9823@sha256:986535ff3e1e66fcfa8b58b0e99ef4c4f7dce10400223b33e7056f7c68f6f15b"` | |
+| jitsi.jibri.image.tag | string | `"stable-9955@sha256:893ea6eca8966dccea5d3e6745b2f8aae7f2906cb995ebe798a63e6e52b00c93"` | |
| jitsi.jibri.livenessProbe.failureThreshold | int | `10` | |
| jitsi.jibri.livenessProbe.initialDelaySeconds | int | `15` | |
| jitsi.jibri.livenessProbe.timeoutSeconds | int | `3` | |
@@ -90,13 +90,21 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| jitsi.jicofo.extraEnvs.ENABLE_AUTO_LOGIN | string | `"false"` | |
| jitsi.jicofo.extraEnvs.JICOFO_AUTH_LIFETIME | string | `"100 milliseconds"` | |
| jitsi.jicofo.image.pullPolicy | string | `"IfNotPresent"` | |
-| jitsi.jicofo.image.tag | string | `"stable-9823@sha256:a8b7179010924e0a9da965478b1dd67570af87a79c49da184c43de2911cc9e64"` | |
+| jitsi.jicofo.image.tag | string | `"stable-9955@sha256:473e7994018d61d29cf296ef6bca03c6ac71ae697a15e3ecff5d39cc569e7a39"` | |
| jitsi.jicofo.securityContext.allowPrivilegeEscalation | bool | `false` | |
| jitsi.jicofo.securityContext.readOnlyRootFilesystem | bool | `false` | |
| jitsi.jicofo.securityContext.runAsNonRoot | bool | `false` | |
| jitsi.jicofo.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
+| jitsi.jigasi.enabled | bool | `true` | |
+| jitsi.jigasi.extraEnvs.JIGASI_SIP_DEFAULT_ROOM | string | `"siptest@muc.meet.jitsi"` | |
+| jitsi.jigasi.image.pullPolicy | string | `"IfNotPresent"` | |
+| jitsi.jigasi.image.tag | string | `"stable-9955@sha256:4ae9592e8e12ff5cf97f12d0895f231eeb82b9348d8a4b01fb0caea6a48d8efa"` | |
+| jitsi.jigasi.securityContext.allowPrivilegeEscalation | bool | `false` | |
+| jitsi.jigasi.securityContext.readOnlyRootFilesystem | bool | `false` | |
+| jitsi.jigasi.securityContext.runAsNonRoot | bool | `false` | |
+| jitsi.jigasi.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
| jitsi.jvb.image.pullPolicy | string | `"IfNotPresent"` | |
-| jitsi.jvb.image.tag | string | `"stable-9823@sha256:9ae3deb1b89d80b9056ead1cac90fd47c700d6da77a5d3eb7a6c1d76bd5b9588"` | |
+| jitsi.jvb.image.tag | string | `"stable-9955@sha256:9f57b4bd09a94e68a57bba6c30070cca801cd8e9466e31bc7361e081cc625980"` | |
| jitsi.jvb.replicaCount | int | `1` | |
| jitsi.jvb.securityContext.allowPrivilegeEscalation | bool | `false` | |
| jitsi.jvb.securityContext.readOnlyRootFilesystem | bool | `false` | |
@@ -108,15 +116,19 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| jitsi.prosody.extraEnvs[0].name | string | `"AUTH_TYPE"` | |
| jitsi.prosody.extraEnvs[0].value | string | `"jwt"` | |
| jitsi.prosody.image.pullPolicy | string | `"IfNotPresent"` | |
-| jitsi.prosody.image.tag | string | `"stable-9823@sha256:7e68fb1c670efaaa3221040db431e447474f48964f6a3131fafa09433f2c67c0"` | |
+| jitsi.prosody.image.tag | string | `"stable-9955@sha256:27d5f83b1989a7fc699e40f16b1d97e45be5c22507dc5e56eca59f80f106e385"` | |
| jitsi.prosody.securityContext.allowPrivilegeEscalation | bool | `false` | |
| jitsi.prosody.securityContext.readOnlyRootFilesystem | bool | `false` | |
| jitsi.prosody.securityContext.runAsNonRoot | bool | `false` | |
| jitsi.prosody.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
| jitsi.publicURL | string | `"https://jitsi.mydomain.tld"` | |
| jitsi.tz | string | `"Europe/Berlin"` | |
+| jitsi.web.extraConfig.dialinCountryCode | string | `"DE"` | |
+| jitsi.web.extraConfig.dialinPhoneNumbers | string | `""` | |
| jitsi.web.extraConfig.doNotStoreRoom | bool | `false` | |
| jitsi.web.extraEnvs.COLIBRI_WEBSOCKET_REGEX | string | `"[a-z0-9._-]+"` | |
+| jitsi.web.extraEnvs.CONFCODE_URL | string | `"https://jitsi-api.jitsi.net/conferenceMapper"` | |
+| jitsi.web.extraEnvs.DIALIN_NUMBERS_URL | string | `"/static/dialin-phone-numbers.json"` | |
| jitsi.web.extraVolumeMounts[0].mountPath | string | `"/config/custom-config.js"` | |
| jitsi.web.extraVolumeMounts[0].name | string | `"jitsi-meet-files"` | |
| jitsi.web.extraVolumeMounts[0].subPath | string | `"custom-config.js"` | |
@@ -164,32 +176,34 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| jitsi.web.extraVolumeMounts[9].subPath | string | `"lang-overwritten-de.json"` | |
| jitsi.web.extraVolumes[0].configMap.items[0].key | string | `"body.html"` | |
| jitsi.web.extraVolumes[0].configMap.items[0].path | string | `"body.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[10].key | string | `"plugin.head.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[10].path | string | `"plugin.head.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[11].key | string | `"url-ics"` | |
-| jitsi.web.extraVolumes[0].configMap.items[11].path | string | `"url-ics"` | |
-| jitsi.web.extraVolumes[0].configMap.items[12].key | string | `"url-portal"` | |
-| jitsi.web.extraVolumes[0].configMap.items[12].path | string | `"url-portal"` | |
-| jitsi.web.extraVolumes[0].configMap.items[13].key | string | `"watermark.svg"` | |
-| jitsi.web.extraVolumes[0].configMap.items[13].path | string | `"watermark.svg"` | |
+| jitsi.web.extraVolumes[0].configMap.items[10].key | string | `"oidc-redirect.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[10].path | string | `"oidc-redirect.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[11].key | string | `"plugin.head.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[11].path | string | `"plugin.head.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[12].key | string | `"url-ics"` | |
+| jitsi.web.extraVolumes[0].configMap.items[12].path | string | `"url-ics"` | |
+| jitsi.web.extraVolumes[0].configMap.items[13].key | string | `"url-portal"` | |
+| jitsi.web.extraVolumes[0].configMap.items[13].path | string | `"url-portal"` | |
+| jitsi.web.extraVolumes[0].configMap.items[14].key | string | `"watermark.svg"` | |
+| jitsi.web.extraVolumes[0].configMap.items[14].path | string | `"watermark.svg"` | |
| jitsi.web.extraVolumes[0].configMap.items[1].key | string | `"branding.json"` | |
| jitsi.web.extraVolumes[0].configMap.items[1].path | string | `"branding.json"` | |
| jitsi.web.extraVolumes[0].configMap.items[2].key | string | `"custom-config.js"` | |
| jitsi.web.extraVolumes[0].configMap.items[2].path | string | `"custom-config.js"` | |
| jitsi.web.extraVolumes[0].configMap.items[3].key | string | `"custom-interface_config.js"` | |
| jitsi.web.extraVolumes[0].configMap.items[3].path | string | `"custom-interface_config.js"` | |
-| jitsi.web.extraVolumes[0].configMap.items[4].key | string | `"favicon.svg"` | |
-| jitsi.web.extraVolumes[0].configMap.items[4].path | string | `"favicon.svg"` | |
-| jitsi.web.extraVolumes[0].configMap.items[5].key | string | `"lang-overwritten-de.json"` | |
-| jitsi.web.extraVolumes[0].configMap.items[5].path | string | `"lang-overwritten-de.json"` | |
-| jitsi.web.extraVolumes[0].configMap.items[6].key | string | `"lang-overwritten-en.json"` | |
-| jitsi.web.extraVolumes[0].configMap.items[6].path | string | `"lang-overwritten-en.json"` | |
-| jitsi.web.extraVolumes[0].configMap.items[7].key | string | `"meet.oidc.conf"` | |
-| jitsi.web.extraVolumes[0].configMap.items[7].path | string | `"meet.oidc.conf"` | |
-| jitsi.web.extraVolumes[0].configMap.items[8].key | string | `"oidc-adapter.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[8].path | string | `"oidc-adapter.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[9].key | string | `"oidc-redirect.html"` | |
-| jitsi.web.extraVolumes[0].configMap.items[9].path | string | `"oidc-redirect.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[4].key | string | `"dialin-phone-numbers.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[4].path | string | `"dialin-phone-numbers.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[5].key | string | `"favicon.svg"` | |
+| jitsi.web.extraVolumes[0].configMap.items[5].path | string | `"favicon.svg"` | |
+| jitsi.web.extraVolumes[0].configMap.items[6].key | string | `"lang-overwritten-de.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[6].path | string | `"lang-overwritten-de.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[7].key | string | `"lang-overwritten-en.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[7].path | string | `"lang-overwritten-en.json"` | |
+| jitsi.web.extraVolumes[0].configMap.items[8].key | string | `"meet.oidc.conf"` | |
+| jitsi.web.extraVolumes[0].configMap.items[8].path | string | `"meet.oidc.conf"` | |
+| jitsi.web.extraVolumes[0].configMap.items[9].key | string | `"oidc-adapter.html"` | |
+| jitsi.web.extraVolumes[0].configMap.items[9].path | string | `"oidc-adapter.html"` | |
| jitsi.web.extraVolumes[0].configMap.name | string | `"jitsi-meet-files"` | |
| jitsi.web.extraVolumes[0].name | string | `"jitsi-meet-files"` | |
| jitsi.web.extraVolumes[1].configMap.items[0].key | string | `"welcome-background.jpg"` | |
@@ -197,7 +211,7 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi
| jitsi.web.extraVolumes[1].configMap.name | string | `"jitsi-meet-binaries"` | |
| jitsi.web.extraVolumes[1].name | string | `"jitsi-meet-binaries"` | |
| jitsi.web.image.pullPolicy | string | `"IfNotPresent"` | |
-| jitsi.web.image.tag | string | `"stable-9823@sha256:1cb2c7eb8b65abedfafb1db66c1beedbba43b208649fbf090b4ed81128dbc115"` | |
+| jitsi.web.image.tag | string | `"stable-9955@sha256:23458904c9e9ff391df42567a3e667710754c584ab77db7abfe432a6ebd0fcec"` | |
| jitsi.web.ingress.annotations."ingress.cilium.io/tcp-keep-alive" | string | `"enabled"` | |
| jitsi.web.ingress.annotations."ingress.cilium.io/websocket" | string | `"enabled"` | |
| jitsi.web.ingress.annotations."nginx.ingress.kubernetes.io/proxy-read-timeout" | string | `"3600"` | |
--
GitLab
From 3cfcd723c5846bd52905877cb38555613f519c21 Mon Sep 17 00:00:00 2001
From: emrah <emrah.eryilmaz@nordeck.net>
Date: Tue, 21 Jan 2025 17:09:49 +0300
Subject: [PATCH 13/13] refactor(values.yaml): Add a comment for
dialinPhoneNumbers
---
charts/opendesk-jitsi/values.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml
index 7a9e6f1..ec43d70 100644
--- a/charts/opendesk-jitsi/values.yaml
+++ b/charts/opendesk-jitsi/values.yaml
@@ -226,6 +226,7 @@ jitsi:
extraConfig:
doNotStoreRoom: false
dialinCountryCode: "DE"
+ # e.g. "+49 1111 22233344"
dialinPhoneNumbers: ""
extraEnvs:
COLIBRI_WEBSOCKET_REGEX: "[a-z0-9._-]+"
--
GitLab