File tree 5 files changed +67
-1
lines changed
5 files changed +67
-1
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
12
12
13
13
- Add peertube transcript generation
14
14
15
+ ### Changed
16
+
17
+ - Split websocket and asgi apps in tray
18
+
15
19
### Fixed
16
20
17
21
- Allow to change username if one is persisted on classroom join
Original file line number Diff line number Diff line change
1
+ {% set service_variant = "ws" %}
2
+ {% set marsha_replicas = marsha_ws_replicas %}
3
+ {% set marsha_livenessprobe = {
4
+ "httpGet" : {
5
+ "path" : "/__heartbeat__" ,
6
+ "port" : "django-port" ,
7
+ "httpHeaders" : [{
8
+ "name" : "Host" ,
9
+ "value" : marsha_hosts [0],
10
+ }],
11
+ },
12
+ "initialDelaySeconds" : 60,
13
+ "periodSeconds" : 30 ,
14
+ } %}
15
+ {% set marsha_readynessprobe = {
16
+ "httpGet" : {
17
+ "path" : "/__lbheartbeat__" ,
18
+ "port" : "django-port" ,
19
+ "httpHeaders" : [{
20
+ "name" : "Host" ,
21
+ "value" : marsha_hosts [0],
22
+ }],
23
+ },
24
+ "initialDelaySeconds" : 10,
25
+ "periodSeconds" : 5,
26
+ } %}
27
+ {% set marsha_resources = marsha_ws_resources %}
28
+
29
+ {% include "./_deploy_base.yml.j2" with context %}
Original file line number Diff line number Diff line change
1
+ apiVersion: v1
2
+ kind: Service
3
+ metadata:
4
+ labels:
5
+ app: marsha
6
+ service: ws
7
+ version: "{{ marsha_image_tag }}"
8
+ deployment_stamp: "{{ deployment_stamp }}"
9
+ name: marsha-ws-{{ deployment_stamp }} # name of the service should be host name in nginx
10
+ namespace: "{{ namespace_name }}"
11
+ spec:
12
+ ports:
13
+ - name: {{ marsha_django_port }}-tcp
14
+ port: {{ marsha_django_port }}
15
+ protocol: TCP
16
+ targetPort: {{ marsha_django_port }}
17
+ selector:
18
+ app: marsha
19
+ deployment: "marsha-ws-{{ deployment_stamp }}"
20
+ type: ClusterIP
Original file line number Diff line number Diff line change @@ -4,6 +4,10 @@ upstream marsha-backend {
4
4
server marsha-app-{{ deployment_stamp }}:{{ marsha_django_port }} fail_timeout=0;
5
5
}
6
6
7
+ upstream marsha-ws {
8
+ server marsha-ws-{{ deployment_stamp }}:{{ marsha_django_port }} fail_timeout=0;
9
+ }
10
+
7
11
upstream marsha-xapi {
8
12
server marsha-xapi-{{ deployment_stamp }}:{{ marsha_django_port }} fail_timeout=0;
9
13
}
@@ -62,7 +66,7 @@ server {
62
66
}
63
67
64
68
location /ws/ {
65
- proxy_pass http://marsha-backend ;
69
+ proxy_pass http://marsha-ws ;
66
70
67
71
proxy_http_version 1.1;
68
72
proxy_set_header Connection "Upgrade";
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ marsha_image_name: "fundocker/marsha"
33
33
marsha_image_tag : " 3.23.0"
34
34
marsha_django_port : 8000
35
35
marsha_app_replicas : 1
36
+ marsha_ws_replicas : 1
36
37
marsha_xapi_replicas : 1
37
38
marsha_celery_replicas : 1
38
39
marsha_django_configuration : " Development"
@@ -123,6 +124,14 @@ marsha_app_resources:
123
124
cpu : 0.8
124
125
memory : 1Gi
125
126
127
+ marsha_ws_resources :
128
+ requests :
129
+ cpu : 0.3
130
+ memory : 500Mi
131
+ limits :
132
+ cpu : 0.8
133
+ memory : 1Gi
134
+
126
135
marsha_xapi_resources :
127
136
requests :
128
137
cpu : 0.3
You can’t perform that action at this time.
0 commit comments