Skip to content

Commit 63661c3

Browse files
author
iops
committed
move values to chart
1 parent 14a89cc commit 63661c3

File tree

7 files changed

+134
-67
lines changed

7 files changed

+134
-67
lines changed

‎charts/jitsi/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
name: jitsi
3-
version: 0.0.2
3+
version: 0.0.3

‎charts/jitsi/templates/ingress.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
spec:
1010
ingressClassName: nginx
1111
rules:
12-
- host: {{ .Values.jitsi.serverName }}
12+
- host: {{ .Values.serverName }}
1313
http:
1414
paths:
1515
- pathType: ImplementationSpecific
@@ -35,5 +35,5 @@ spec:
3535
path: /colibri-ws
3636
tls:
3737
- hosts:
38-
- {{ .Values.jitsi.serverName }}
38+
- {{ .Values.serverName }}
3939
secretName: tls

‎charts/jitsi/templates/jicofo-deployment.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ spec:
1919
spec:
2020
containers:
2121
- name: jicofo
22-
image: {{ .Values.jitsi.jicofo.image.repository }}:{{ .Values.jitsi.jicofo.image.tag }}
23-
imagePullPolicy: {{ .Values.jitsi.jicofo.image.pullPolicy }}
22+
image: {{ .Values.jicofo.image.repository }}:{{ .Values.jicofo.image.tag }}
23+
imagePullPolicy: {{ .Values.jicofo.image.pullPolicy }}
2424
resources:
25-
{{ toYaml .Values.jitsi.jicofo.resources | nindent 12 }}
25+
{{ toYaml .Values.jicofo.resources | nindent 12 }}
2626
env:
2727
- name: XMPP_SERVER
2828
value: prosody
@@ -35,27 +35,27 @@ spec:
3535
- name: XMPP_INTERNAL_MUC_DOMAIN
3636
value: internal-muc.meet.jitsi
3737
- name: JICOFO_COMPONENT_SECRET
38-
value: {{ .Values.jitsi.jicofo.componentSecret | quote }}
38+
value: {{ .Values.jicofo.componentSecret | quote }}
3939
- name: JICOFO_AUTH_USER
40-
value: {{ .Values.jitsi.jicofo.authUser | quote }}
40+
value: {{ .Values.jicofo.authUser | quote }}
4141
- name: JICOFO_AUTH_PASSWORD
42-
value: {{ .Values.jitsi.jicofo.authPassword | quote }}
42+
value: {{ .Values.jicofo.authPassword | quote }}
4343
- name: TZ
44-
value: {{ .Values.jitsi.timeZone }}
44+
value: {{ .Values.timeZone }}
4545
- name: JVB_BREWERY_MUC
4646
value: jvbbrewery
47-
{{- if .Values.jitsi.jicofo.extraEnvs }}
48-
{{- toYaml .Values.jitsi.jicofo.extraEnvs | nindent 12 }}
47+
{{- if .Values.jicofo.extraEnvs }}
48+
{{- toYaml .Values.jicofo.extraEnvs | nindent 12 }}
4949
{{- end }}
50-
{{- if .Values.jitsi.jicofo.nodeSelector }}
50+
{{- if .Values.jicofo.nodeSelector }}
5151
nodeSelector:
52-
{{ toYaml .Values.jitsi.jicofo.nodeSelector | nindent 8 }}
52+
{{ toYaml .Values.jicofo.nodeSelector | nindent 8 }}
5353
{{- end }}
54-
{{- if .Values.jitsi.jicofo.tolerations }}
54+
{{- if .Values.jicofo.tolerations }}
5555
tolerations:
56-
{{ toYaml .Values.jitsi.jicofo.tolerations | nindent 8 }}
56+
{{ toYaml .Values.jicofo.tolerations | nindent 8 }}
5757
{{- end }}
58-
{{- if .Values.jitsi.jicofo.affinity }}
58+
{{- if .Values.jicofo.affinity }}
5959
affinity:
60-
{{ toYaml .Values.jitsi.jicofo.affinity | nindent 8 }}
60+
{{ toYaml .Values.jicofo.affinity | nindent 8 }}
6161
{{- end }}

‎charts/jitsi/templates/jvb-deployment.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ spec:
2121
#dnsPolicy: ClusterFirstWithHostNet
2222
containers:
2323
- name: jvb
24-
image: {{ .Values.jitsi.jvb.image.repository }}:{{ .Values.jitsi.jvb.image.tag }}
25-
imagePullPolicy: {{ .Values.jitsi.jvb.image.pullPolicy }}
24+
image: {{ .Values.jvb.image.repository }}:{{ .Values.jvb.image.tag }}
25+
imagePullPolicy: {{ .Values.jvb.image.pullPolicy }}
2626
resources:
27-
{{ toYaml .Values.jitsi.jvb.resources | nindent 12 }}
27+
{{ toYaml .Values.jvb.resources | nindent 12 }}
2828
env:
2929
- name: XMPP_SERVER
3030
value: prosody
@@ -35,39 +35,39 @@ spec:
3535
- name: XMPP_INTERNAL_MUC_DOMAIN
3636
value: internal-muc.meet.jitsi
3737
- name: JVB_STUN_SERVERS
38-
value: {{ join "," .Values.jitsi.jvb.stunServers | quote }}
38+
value: {{ join "," .Values.jvb.stunServers | quote }}
3939
- name: JICOFO_AUTH_USER
40-
value: {{ .Values.jitsi.jicofo.authUser | quote }}
40+
value: {{ .Values.jicofo.authUser | quote }}
4141
- name: JVB_TCP_HARVESTER_DISABLED
4242
value: "false"
4343
- name: JVB_AUTH_USER
44-
value: {{ .Values.jitsi.jvb.authUser | quote }}
44+
value: {{ .Values.jvb.authUser | quote }}
4545
- name: JVB_PORT
4646
value: "30300"
4747
- name: JVB_TCP_PORT
4848
value: "30301"
4949
- name: JVB_AUTH_PASSWORD
50-
value: {{ .Values.jitsi.jvb.authPassword | quote }}
50+
value: {{ .Values.jvb.authPassword | quote }}
5151
- name: JICOFO_AUTH_PASSWORD
52-
value: {{ .Values.jitsi.jicofo.authPassword | quote }}
52+
value: {{ .Values.jicofo.authPassword | quote }}
5353
- name: JVB_BREWERY_MUC
5454
value: jvbbrewery
5555
- name: TZ
56-
value: {{ .Values.jitsi.timeZone }}
56+
value: {{ .Values.timeZone }}
5757
- name: PUBLIC_URL
58-
value: https://{{ .Values.jitsi.serverName }}
59-
{{- if .Values.jitsi.jvb.extraEnvs }}
60-
{{- toYaml .Values.jitsi.jvb.extraEnvs | nindent 12 }}
58+
value: https://{{ .Values.serverName }}
59+
{{- if .Values.jvb.extraEnvs }}
60+
{{- toYaml .Values.jvb.extraEnvs | nindent 12 }}
6161
{{- end }}
62-
{{- if .Values.jitsi.jvb.nodeSelector }}
62+
{{- if .Values.jvb.nodeSelector }}
6363
nodeSelector:
64-
{{ toYaml .Values.jitsi.jvb.nodeSelector | nindent 8 }}
64+
{{ toYaml .Values.jvb.nodeSelector | nindent 8 }}
6565
{{- end }}
66-
{{- if .Values.jitsi.jvb.tolerations }}
66+
{{- if .Values.jvb.tolerations }}
6767
tolerations:
68-
{{ toYaml .Values.jitsi.jvb.tolerations | nindent 8 }}
68+
{{ toYaml .Values.jvb.tolerations | nindent 8 }}
6969
{{- end }}
70-
{{- if .Values.jitsi.jvb.affinity }}
70+
{{- if .Values.jvb.affinity }}
7171
affinity:
72-
{{ toYaml .Values.jitsi.jvb.affinity | nindent 8 }}
72+
{{ toYaml .Values.jvb.affinity | nindent 8 }}
7373
{{- end }}

‎charts/jitsi/templates/prosody-deployment.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ spec:
1919
spec:
2020
containers:
2121
- name: prosody
22-
image: {{ .Values.jitsi.prosody.image.repository }}:{{ .Values.jitsi.prosody.image.tag }}
23-
imagePullPolicy: {{ .Values.jitsi.prosody.image.pullPolicy }}
22+
image: {{ .Values.prosody.image.repository }}:{{ .Values.prosody.image.tag }}
23+
imagePullPolicy: {{ .Values.prosody.image.pullPolicy }}
2424
resources:
25-
{{ toYaml .Values.jitsi.prosody.resources | nindent 12 }}
25+
{{ toYaml .Values.prosody.resources | nindent 12 }}
2626
env:
2727
- name: XMPP_DOMAIN
2828
value: meet.jitsi
@@ -35,31 +35,31 @@ spec:
3535
- name: XMPP_CROSS_DOMAIN
3636
value: "true"
3737
- name: JICOFO_COMPONENT_SECRET
38-
value: {{ .Values.jitsi.jicofo.componentSecret | quote }}
38+
value: {{ .Values.jicofo.componentSecret | quote }}
3939
- name: JVB_AUTH_USER
40-
value: {{ .Values.jitsi.jvb.authUser | quote }}
40+
value: {{ .Values.jvb.authUser | quote }}
4141
- name: JVB_AUTH_PASSWORD
42-
value: {{ .Values.jitsi.jvb.authPassword | quote }}
42+
value: {{ .Values.jvb.authPassword | quote }}
4343
- name: JICOFO_AUTH_USER
44-
value: {{ .Values.jitsi.jicofo.authUser | quote }}
44+
value: {{ .Values.jicofo.authUser | quote }}
4545
- name: JICOFO_AUTH_PASSWORD
46-
value: {{ .Values.jitsi.jicofo.authPassword | quote }}
46+
value: {{ .Values.jicofo.authPassword | quote }}
4747
- name: TZ
48-
value: {{ .Values.jitsi.timeZone }}
48+
value: {{ .Values.timeZone }}
4949
- name: JVB_TCP_HARVESTER_DISABLED
5050
value: "false"
51-
{{- if .Values.jitsi.prosody.extraEnvs }}
52-
{{- toYaml .Values.jitsi.prosody.extraEnvs | nindent 12 }}
51+
{{- if .Values.prosody.extraEnvs }}
52+
{{- toYaml .Values.prosody.extraEnvs | nindent 12 }}
5353
{{- end }}
54-
{{- if .Values.jitsi.prosody.nodeSelector }}
54+
{{- if .Values.prosody.nodeSelector }}
5555
nodeSelector:
56-
{{ toYaml .Values.jitsi.prosody.nodeSelector | nindent 8 }}
56+
{{ toYaml .Values.prosody.nodeSelector | nindent 8 }}
5757
{{- end }}
58-
{{- if .Values.jitsi.prosody.tolerations }}
58+
{{- if .Values.prosody.tolerations }}
5959
tolerations:
60-
{{ toYaml .Values.jitsi.prosody.tolerations | nindent 8 }}
60+
{{ toYaml .Values.prosody.tolerations | nindent 8 }}
6161
{{- end }}
62-
{{- if .Values.jitsi.prosody.affinity }}
62+
{{- if .Values.prosody.affinity }}
6363
affinity:
64-
{{ toYaml .Values.jitsi.prosody.affinity | nindent 8 }}
64+
{{ toYaml .Values.prosody.affinity | nindent 8 }}
6565
{{- end }}

‎charts/jitsi/templates/web-deployment.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ spec:
1919
spec:
2020
containers:
2121
- name: web
22-
image: {{ .Values.jitsi.web.image.repository }}:{{ .Values.jitsi.web.image.tag }}
23-
imagePullPolicy: {{ .Values.jitsi.web.image.pullPolicy }}
22+
image: {{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}
23+
imagePullPolicy: {{ .Values.web.image.pullPolicy }}
2424
resources:
25-
{{ toYaml .Values.jitsi.web.resources | nindent 12 }}
25+
{{ toYaml .Values.web.resources | nindent 12 }}
2626
env:
2727
- name: XMPP_SERVER
2828
value: prosody
2929
- name: JICOFO_AUTH_USER
30-
value: {{ .Values.jitsi.jicofo.authUser | quote }}
30+
value: {{ .Values.jicofo.authUser | quote }}
3131
- name: XMPP_DOMAIN
3232
value: meet.jitsi
3333
- name: XMPP_AUTH_DOMAIN
@@ -39,11 +39,11 @@ spec:
3939
- name: XMPP_MUC_DOMAIN
4040
value: muc.meet.jitsi
4141
- name: TZ
42-
value: {{ .Values.jitsi.timeZone }}
42+
value: {{ .Values.timeZone }}
4343
- name: JVB_TCP_HARVESTER_DISABLED
4444
value: "false"
4545
- name: PUBLIC_URL
46-
value: https://{{ .Values.jitsi.serverName }}
46+
value: https://{{ .Values.serverName }}
4747
- name: ENABLE_LOBBY
4848
value: "0"
4949
- name: ENABLE_WELCOME_PAGE
@@ -56,18 +56,18 @@ spec:
5656
value: "VP9"
5757
- name: VIDEOQUALITY_PREFERRED_CODEC
5858
value: "VP9"
59-
{{- if .Values.jitsi.web.extraEnvs }}
60-
{{- toYaml .Values.jitsi.web.extraEnvs | nindent 12 }}
59+
{{- if .Values.web.extraEnvs }}
60+
{{- toYaml .Values.web.extraEnvs | nindent 12 }}
6161
{{- end }}
62-
{{- if .Values.jitsi.web.nodeSelector }}
62+
{{- if .Values.web.nodeSelector }}
6363
nodeSelector:
64-
{{ toYaml .Values.jitsi.web.nodeSelector | nindent 8 }}
64+
{{ toYaml .Values.web.nodeSelector | nindent 8 }}
6565
{{- end }}
66-
{{- if .Values.jitsi.web.tolerations }}
66+
{{- if .Values.web.tolerations }}
6767
tolerations:
68-
{{ toYaml .Values.jitsi.web.tolerations | nindent 8 }}
68+
{{ toYaml .Values.web.tolerations | nindent 8 }}
6969
{{- end }}
70-
{{- if .Values.jitsi.web.affinity }}
70+
{{- if .Values.web.affinity }}
7171
affinity:
72-
{{ toYaml .Values.jitsi.web.affinity | nindent 8 }}
72+
{{ toYaml .Values.web.affinity | nindent 8 }}
7373
{{- end }}

‎charts/jitsi/values.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
serverName: ''
2+
timeZone: Europe/Amsterdam
3+
jicofo:
4+
replicas: 1
5+
image:
6+
repository: "jitsi/jicofo"
7+
tag: "stable-8960"
8+
pullPolicy: IfNotPresent
9+
resources: {}
10+
nodeSelector: {}
11+
tolerations: []
12+
affinity: {}
13+
componentSecret: ''
14+
authUser: focus
15+
authPassword: ''
16+
extraEnvs: []
17+
#- name: VIDEOQUALITY_ENFORCE_PREFERRED_CODEC
18+
# value: "1"
19+
#- name: P2P_PREFERRED_CODEC
20+
# value: "VP8"
21+
#- name: VIDEOQUALITY_PREFERRED_CODEC
22+
# value: "VP8"
23+
jvb:
24+
replicas: 1
25+
image:
26+
repository: "jitsi/jvb"
27+
tag: "stable-8960"
28+
pullPolicy: IfNotPresent
29+
resources: {}
30+
nodeSelector: {}
31+
tolerations:
32+
- key: "network"
33+
operator: "Equal"
34+
value: "public"
35+
effect: "NoSchedule"
36+
affinity: {}
37+
authUser: jvb
38+
authPassword: ''
39+
stunServers:
40+
- "stun.l.google.com:19302"
41+
- "stun1.l.google.com:19302"
42+
- "stun2.l.google.com:19302"
43+
- "stun3.l.google.com:19302"
44+
- "stun4.l.google.com:19302"
45+
extraEnvs: []
46+
prosody:
47+
replicas: 1
48+
image:
49+
repository: "jitsi/prosody"
50+
tag: "stable-8960"
51+
pullPolicy: IfNotPresent
52+
resources: {}
53+
nodeSelector: {}
54+
tolerations: []
55+
affinity: {}
56+
extraEnvs: {}
57+
web:
58+
replicas: 1
59+
image:
60+
repository: "jitsi/web"
61+
tag: "stable-8960"
62+
pullPolicy: IfNotPresent
63+
resources: {}
64+
nodeSelector: {}
65+
tolerations: []
66+
affinity: {}
67+
extraEnvs: []

0 commit comments

Comments
 (0)