Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-7101 - collaboration service deployment #859

Merged
merged 12 commits into from
May 7, 2024
Merged

BC-7101 - collaboration service deployment #859

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
25c3bd1
initial setup of board collaboration
hoeppner-dataport May 2, 2024
188638e
added board collaboration to namespace activator list
hoeppner-dataport May 2, 2024
c473bf8
Merge branch 'main' of github.com:hpi-schul-cloud/dof_app_deploy into…
hoeppner-dataport May 3, 2024
d9c5b71
activate board collaboration feature on development
hoeppner-dataport May 3, 2024
526962b
fix only deploy one websocket server instance
hoeppner-dataport May 6, 2024
4acf843
add configuration for board collaboration ws uri
hoeppner-dataport May 6, 2024
758fcc3
Merge branch 'main' of github.com:hpi-schul-cloud/dof_app_deploy into…
hoeppner-dataport May 6, 2024
3919330
fix: URI for develop
hoeppner-dataport May 7, 2024
c71eb97
Merge branch 'main' of github.com:hpi-schul-cloud/dof_app_deploy into…
hoeppner-dataport May 7, 2024
f888167
fix: board collaboration uri
hoeppner-dataport May 7, 2024
1d9ab53
set board collaboration uri default to empty = same server
hoeppner-dataport May 7, 2024
5108c9c
replace ws with wss
hoeppner-dataport May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/group_vars/all/with.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ WITH_TLDRAW: true
WITH_API_ADMIN: true
WITH_MOIN_SCHULE: false
WITH_UNSYNCED_ENTITIES_DELETION: false
WITH_BOARD_COLLABORATION: false
3 changes: 3 additions & 0 deletions ansible/group_vars/develop/cfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1

SC_DEFAULT_STORAGE_CLASS_NAME: "nfs-client"

FEATURE_COLUMN_BOARD_SOCKET_ENABLED: "true"
BOARD_COLLABORATION_SERVER_REPLICAS: 1
1 change: 1 addition & 0 deletions ansible/group_vars/develop/with.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ WITH_ERWINIDM: true
WITH_OIDCMOCK: true
WITH_H5P_LIBRARY_MANAGEMENT: true
WITH_H5P_EDITOR: true
WITH_BOARD_COLLABORATION: true
4 changes: 4 additions & 0 deletions ansible/group_vars/production/resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,7 @@ ADMIN_API_SERVER_CPU_LIMITS: "2000m"
ADMIN_API_SERVER_MEMORY_LIMITS: "4Gi"
ADMIN_API_SERVER_CPU_REQUESTS: "100m"
ADMIN_API_SERVER_MEMORY_REQUESTS: "4Gi"
BOARD_COLLABORATION_CPU_LIMITS: "2000m"
BOARD_COLLABORATION_MEMORY_LIMITS: "2Gi"
BOARD_COLLABORATION_CPU_REQUESTS: "100m"
BOARD_COLLABORATION_MEMORY_REQUESTS: "2Gi"
5 changes: 4 additions & 1 deletion ansible/group_vars/reference/resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,7 @@ ADMIN_API_SERVER_CPU_LIMITS: "2000m"
ADMIN_API_SERVER_MEMORY_LIMITS: "4Gi"
ADMIN_API_SERVER_CPU_REQUESTS: "100m"
ADMIN_API_SERVER_MEMORY_REQUESTS: "4Gi"

BOARD_COLLABORATION_CPU_LIMITS: "2000m"
BOARD_COLLABORATION_MEMORY_LIMITS: "2Gi"
BOARD_COLLABORATION_CPU_REQUESTS: "500m"
BOARD_COLLABORATION_MEMORY_REQUESTS: "2Gi"
1 change: 1 addition & 0 deletions ansible/host_vars/prod-brb/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 12
ADMIN_API_SERVER_REPLICAS: 3
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/prod-dbc/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 12
ADMIN_API_SERVER_REPLICAS: 3
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/prod-nbc/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 12
ADMIN_API_SERVER_REPLICAS: 3
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/prod-thr/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 12
ADMIN_API_SERVER_REPLICAS: 3
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/ref-audit/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ AMQP_FILE_STORAGE_REPLICAS: 3
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/ref-brb/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/ref-dbc/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/ref-nbc/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/host_vars/ref-thr/pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 3
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
1 change: 1 addition & 0 deletions ansible/roles/namespace-activator-scaled-objects/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ deployments_for_scaled_objects:
- tldraw-client-deployment
- mailcatcher-deployment
- maildrop-deployment
- board-collaboration-deployment
Loading