From e433bc27fe52c8fa7c71e351b04b10d81f61cadf Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Thu, 4 Apr 2024 11:03:02 +0200 Subject: [PATCH 1/2] helm chart - allow to adjust TALK_MAX_STREAM_BITRATE Signed-off-by: Simon L --- Containers/talk/start.sh | 6 ++++++ .../templates/nextcloud-aio-talk-deployment.yaml | 2 ++ nextcloud-aio-helm-chart/update-helm.sh | 9 +++++++++ nextcloud-aio-helm-chart/values.yaml | 1 + 4 files changed, 18 insertions(+) diff --git a/Containers/talk/start.sh b/Containers/talk/start.sh index d40e5ee5959..76bfbb815aa 100644 --- a/Containers/talk/start.sh +++ b/Containers/talk/start.sh @@ -56,6 +56,10 @@ TURN_CONF # Remove empty lines so that the config is not invalid sed -i '/""/d' /conf/eturnal.yml +if [ -z "$TALK_MAX_STREAM_BITRATE" ]; then + TALK_MAX_STREAM_BITRATE=1048576 +fi + # Signling cat << SIGNALING_CONF > "/conf/signaling.conf" [http] @@ -80,6 +84,7 @@ connectionsperhost = 8 [backend-1] url = https://${NC_DOMAIN} secret = ${SIGNALING_SECRET} +maxstreambitrate = ${TALK_MAX_STREAM_BITRATE} [nats] url = nats://127.0.0.1:4222 @@ -87,6 +92,7 @@ url = nats://127.0.0.1:4222 [mcu] type = janus url = ws://127.0.0.1:8188 +maxstreambitrate = ${TALK_MAX_STREAM_BITRATE} SIGNALING_CONF exec "$@" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml index d4843093ae2..2f641a16a92 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -25,6 +25,8 @@ spec: spec: containers: - env: + - name: TALK_MAX_STREAM_BITRATE + value: "{{ .Values.TALK_MAX_STREAM_BITRATE }}" - name: INTERNAL_SECRET value: "{{ .Values.TALK_INTERNAL_SECRET }}" - name: NC_DOMAIN diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh index 1cf2327a49e..c1719ef25cf 100755 --- a/nextcloud-aio-helm-chart/update-helm.sh +++ b/nextcloud-aio-helm-chart/update-helm.sh @@ -300,6 +300,14 @@ EOL # shellcheck disable=SC1083 find ./ -name '*apache-deployment.yaml' -exec sed -i "/^.*\- env:/r /tmp/additional-apache.config" \{} \; +# Additional config +cat << EOL > /tmp/additional-talk.config + - name: TALK_MAX_STREAM_BITRATE + value: "{{ .Values.TALK_MAX_STREAM_BITRATE }}" +EOL +# shellcheck disable=SC1083 +find ./ -name '*talk-deployment.yaml' -exec sed -i "/^.*\- env:/r /tmp/additional-talk.config" \{} \; + # shellcheck disable=SC1083 find ./ -name '*deployment.yaml' -exec sed -i '/image: nextcloud/s/$/"/;s|image: nextcloud/|image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/|;' \{} \; @@ -356,6 +364,7 @@ SMTP_NAME: # (empty by default): The username for the authentication. SMTP_PASSWORD: # (empty by default): The password for the authentication. MAIL_FROM_ADDRESS: # (not set by default): Set the local-part for the 'from' field in the emails sent by Nextcloud. MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed. +TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb IMAGE_MIRROR_PREFIX: # Setting this allows you to pull Nextcloud images through a mirror registry. NEXTCLOUD_IMAGE_ORG: nextcloud # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons. diff --git a/nextcloud-aio-helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml index 5144040849a..f554d9b8010 100755 --- a/nextcloud-aio-helm-chart/values.yaml +++ b/nextcloud-aio-helm-chart/values.yaml @@ -61,6 +61,7 @@ SMTP_NAME: # (empty by default): The username for the authentication. SMTP_PASSWORD: # (empty by default): The password for the authentication. MAIL_FROM_ADDRESS: # (not set by default): Set the local-part for the 'from' field in the emails sent by Nextcloud. MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed. +TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb IMAGE_MIRROR_PREFIX: # Setting this allows you to pull Nextcloud images through a mirror registry. NEXTCLOUD_IMAGE_ORG: nextcloud # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons. From 9a4e7e6abd18e30e51a18b04788abfe653b23d7d Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Thu, 4 Apr 2024 11:33:45 +0200 Subject: [PATCH 2/2] increase to 8.2.0-dev Signed-off-by: Simon L --- nextcloud-aio-helm-chart/Chart.yaml | 2 +- .../templates/nextcloud-aio-talk-deployment.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 72dc94c2658..eef44781af8 100755 --- a/nextcloud-aio-helm-chart/Chart.yaml +++ b/nextcloud-aio-helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nextcloud-aio-helm-chart description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose -version: 8.1.0 +version: 8.2.0-dev apiVersion: v2 keywords: - latest diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml index 2f641a16a92..75db22fd7db 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -39,7 +39,8 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk:20240404_082330-latest" + image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk:develop" + imagePullPolicy: Always name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }}