example: added publicURL to values and update prosody service port

jitsi-contrib · Mar 31, 2021 · 61f6824 · 61f6824
1 parent 5608d0a
commit 61f6824
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/examples/helm/charts/prosody/templates/ingress.yaml b/examples/helm/charts/prosody/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "prosody.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcPort := index .Values.service.ports "bosh-insecure" -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}

diff --git a/examples/helm/charts/prosody/templates/tests/test-connection.yaml b/examples/helm/charts/prosody/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "prosody.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "prosody.fullname" . }}:{{ index .Values.service.ports "bosh-insecure" }}']
   restartPolicy: Never
diff --git a/examples/helm/templates/_helpers.tpl b/examples/helm/templates/_helpers.tpl
@@ -91,7 +91,7 @@ Create the name of the service account to use
 
 {{- define "jitsi-meet.publicURL" -}}
 {{- if .Values.publicURL }}
-{{ .Values.pulicURL }}
+{{- .Values.publicURL -}}
 {{- else -}}
 {{- if .Values.web.ingress.tls -}}https://{{- else -}}http://{{- end -}}
 {{- if .Values.web.ingress.tls -}}

diff --git a/examples/helm/values.yaml b/examples/helm/values.yaml
@@ -11,6 +11,7 @@ fullnameOverride: ""
 
 enableAuth: false
 enableGuests: true
+publicURL: ""
 
 tz: Europe/Amsterdam