diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index bcc28e532..b9122ac72 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1049,6 +1049,11 @@ configuration_all: server: true client: false nuxtclient: false + BOARD_COLLABORATION_URI: + value: "wss://{{ DOMAIN }}" + server: true + client: false + nuxtclient: true FEATURE_NEW_LAYOUT_ENABLED: value: "false" server: true diff --git a/ansible/group_vars/all/with.yml b/ansible/group_vars/all/with.yml index f2a43a213..8df5e12b0 100644 --- a/ansible/group_vars/all/with.yml +++ b/ansible/group_vars/all/with.yml @@ -14,4 +14,5 @@ WITH_TLDRAW: true WITH_API_ADMIN: true WITH_MOIN_SCHULE: false WITH_UNSYNCED_ENTITIES_DELETION: false +WITH_BOARD_COLLABORATION: false WITH_MIGRATION_SYSTEMS: false diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index d475c1f9c..bec87c321 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -35,4 +35,8 @@ ADMIN_API_SERVER_REPLICAS: 1 SC_DEFAULT_STORAGE_CLASS_NAME: "nfs-client" +FEATURE_COLUMN_BOARD_SOCKET_ENABLED: "true" + +BOARD_COLLABORATION_SERVER_REPLICAS: 1 + FEATURE_NEW_LAYOUT_ENABLED: "true" diff --git a/ansible/group_vars/develop/with.yml b/ansible/group_vars/develop/with.yml index 2789e65c9..723abb523 100644 --- a/ansible/group_vars/develop/with.yml +++ b/ansible/group_vars/develop/with.yml @@ -6,3 +6,4 @@ WITH_ERWINIDM: true WITH_OIDCMOCK: true WITH_H5P_LIBRARY_MANAGEMENT: true WITH_H5P_EDITOR: true +WITH_BOARD_COLLABORATION: true diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml index 107ee15ff..f2fd4c3a4 100644 --- a/ansible/group_vars/production/resources.yml +++ b/ansible/group_vars/production/resources.yml @@ -107,3 +107,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" diff --git a/ansible/group_vars/reference/resources.yml b/ansible/group_vars/reference/resources.yml index 0592d1dd0..cc3596516 100644 --- a/ansible/group_vars/reference/resources.yml +++ b/ansible/group_vars/reference/resources.yml @@ -107,4 +107,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" diff --git a/ansible/host_vars/prod-brb/pod.yml b/ansible/host_vars/prod-brb/pod.yml index 65cf7cf22..49e41e43e 100644 --- a/ansible/host_vars/prod-brb/pod.yml +++ b/ansible/host_vars/prod-brb/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-dbc/pod.yml b/ansible/host_vars/prod-dbc/pod.yml index e6231797e..b15850805 100644 --- a/ansible/host_vars/prod-dbc/pod.yml +++ b/ansible/host_vars/prod-dbc/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-nbc/pod.yml b/ansible/host_vars/prod-nbc/pod.yml index c869b4dcf..8d53b4851 100644 --- a/ansible/host_vars/prod-nbc/pod.yml +++ b/ansible/host_vars/prod-nbc/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-thr/pod.yml b/ansible/host_vars/prod-thr/pod.yml index bdd817a1f..bc73e0041 100644 --- a/ansible/host_vars/prod-thr/pod.yml +++ b/ansible/host_vars/prod-thr/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-audit/pod.yml b/ansible/host_vars/ref-audit/pod.yml index 808e6150e..35f322ea3 100644 --- a/ansible/host_vars/ref-audit/pod.yml +++ b/ansible/host_vars/ref-audit/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-brb/pod.yml b/ansible/host_vars/ref-brb/pod.yml index 9a072b6b5..bb164d564 100644 --- a/ansible/host_vars/ref-brb/pod.yml +++ b/ansible/host_vars/ref-brb/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-dbc/pod.yml b/ansible/host_vars/ref-dbc/pod.yml index 9a072b6b5..bb164d564 100644 --- a/ansible/host_vars/ref-dbc/pod.yml +++ b/ansible/host_vars/ref-dbc/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-nbc/pod.yml b/ansible/host_vars/ref-nbc/pod.yml index 67d887f37..317aa6900 100644 --- a/ansible/host_vars/ref-nbc/pod.yml +++ b/ansible/host_vars/ref-nbc/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-thr/pod.yml b/ansible/host_vars/ref-thr/pod.yml index 4699392eb..85993ac72 100644 --- a/ansible/host_vars/ref-thr/pod.yml +++ b/ansible/host_vars/ref-thr/pod.yml @@ -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 diff --git a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml index e4c252a91..3188470d7 100644 --- a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml +++ b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml @@ -30,3 +30,4 @@ deployments_for_scaled_objects: - tldraw-client-deployment - mailcatcher-deployment - maildrop-deployment + - board-collaboration-deployment