From c501408425960dc52cbc83f8f41ccf0fb74c8b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Ivankovi=C4=87?= <33936733+Veki301@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:21:40 +0100 Subject: [PATCH 1/2] change coturn defaults, bump charts version --- charts/coturn/Chart.yaml | 2 +- charts/coturn/values.yaml | 6 +++--- src/ns_turn_defs.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/coturn/Chart.yaml b/charts/coturn/Chart.yaml index 6a8abef6c9..a1203f4aef 100644 --- a/charts/coturn/Chart.yaml +++ b/charts/coturn/Chart.yaml @@ -11,4 +11,4 @@ version: 0.0.42 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.6.2-federation-wireapp.16 +appVersion: 4.6.2-federation-wireapp.2i diff --git a/charts/coturn/values.yaml b/charts/coturn/values.yaml index 913907c55c..913f3522b8 100644 --- a/charts/coturn/values.yaml +++ b/charts/coturn/values.yaml @@ -26,9 +26,9 @@ coturnTurnListenPort: 3478 coturnMetricsListenPort: 9641 coturnTurnTlsListenPort: 5349 -# coturnTurnListenIP: "1.2.3.4" # can also be __COTURN_EXT_IP__, __COTURN_POD_IP__,__COTURN_HOST_IP__ -coturnTurnExternalIP: null -# coturnTurnRelayIP: +coturnTurnListenIP: "__COTURN_POD_IP__" # "1.2.3.4" # can also be __COTURN_EXT_IP__, __COTURN_POD_IP__,__COTURN_HOST_IP__ +coturnTurnRelayIP: "__COTURN_POD_IP__" +coturnTurnExternalIP: "__COTURN_EXT_IP__" # coturnPrometheusIP: # coturnFederationListeningIP: diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h index 236e671c24..415217dbb4 100644 --- a/src/ns_turn_defs.h +++ b/src/ns_turn_defs.h @@ -31,7 +31,7 @@ #ifndef __IOADEFS__ #define __IOADEFS__ -#define TURN_SERVER_VERSION "wireapp/4.6.2h" +#define TURN_SERVER_VERSION "wireapp/4.6.2i" #define TURN_SERVER_VERSION_NAME "Gorst" #ifndef TURN_SERVER_BUILD_INFO #define TURN_SERVER_BUILD_INFO "" From 49c5fb62a0a603f4617618a912e58a46d243f898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Ivankovi=C4=87?= <33936733+Veki301@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:35:42 +0100 Subject: [PATCH 2/2] remove default from chart template, "defaults" now in chart/values.yaml file --- .../coturn/templates/configmap-coturn-conf-template.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/coturn/templates/configmap-coturn-conf-template.yaml b/charts/coturn/templates/configmap-coturn-conf-template.yaml index 9f5796ac83..65954df046 100644 --- a/charts/coturn/templates/configmap-coturn-conf-template.yaml +++ b/charts/coturn/templates/configmap-coturn-conf-template.yaml @@ -29,11 +29,11 @@ data: pidfile="/var/tmp/turnserver.pid" ## turn, stun. - listening-ip={{ default "__COTURN_EXT_IP__" .Values.coturnTurnListenIP }} + listening-ip={{ .Values.coturnTurnListenIP }} listening-port={{ .Values.coturnTurnListenPort }} - relay-ip={{ default "__COTURN_EXT_IP__" .Values.coturnTurnRelayIP }} + relay-ip={{ .Values.coturnTurnRelayIP }} {{- if .Values.coturnTurnExternalIP }} - external-ip={{ default "__COTURN_EXT_IP__" .Values.coturnTurnExternalIP }} + external-ip={{ .Values.coturnTurnExternalIP }} {{- end }} realm=dummy.io no-stun-backward-compatibility @@ -115,4 +115,4 @@ data: ## rate-limiting config 401-req-limit={{ .Values.ratelimit.requestLimit }} 401-window={{ .Values.ratelimit.window }} - {{- end }} \ No newline at end of file + {{- end }}