diff --git a/.github/scripts/tag_images.sh b/.github/scripts/tag_images.sh index 8c55a4d..3cef816 100755 --- a/.github/scripts/tag_images.sh +++ b/.github/scripts/tag_images.sh @@ -23,7 +23,6 @@ img_list=( sso_invitation_email_sender workers viewer_360 - xkt_worker xkt_v10_worker dwg_worker image_preview_worker diff --git a/README.md b/README.md index 1ec1443..efd1a47 100644 --- a/README.md +++ b/README.md @@ -267,10 +267,6 @@ Object storage (S3): | workers_merge_cpu | 1 | Number of CPUs allocated for each replicas. | | workers_merge_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. | | workers_merge_task_timeout | "{{ '2h' | community.general.to_seconds | int }}" | Timeout for a merge process. | -| workers_xkt_instance | 1 | Number of replicas deployed on *each* worker server. | -| workers_xkt_cpu | 1 | Number of CPUs allocated for each replicas. | -| workers_xkt_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. | -| workers_xkt_task_timeout | "{{ '3min' | community.general.to_seconds | int }}" | Timeout for an XKT process. | | workers_xkt_v10_instance | 1 | Number of replicas deployed on *each* worker server. | | workers_xkt_v10_cpu | 1 | Number of CPUs allocated for each replicas. | | workers_xkt_v10_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. | @@ -452,8 +448,6 @@ with the [db] server on these ports. | docker_workers_svg_tag | "{{ docker_bimdata_tag }}" | Worker SVG docker tag. | | docker_workers_merge_image | "{{ docker_private_registry }}/on-premises/workers" | Worker merge docker image. | | docker_workers_merge_tag | "{{ docker_bimdata_tag }}" | Worker merge docker tag. | -| docker_workers_xkt_image | "{{ docker_private_registry }}/on-premises/xkt_worker" | Worker XKT docker image. | -| docker_workers_xkt_tag | "{{ docker_bimdata_tag }}" | Worker XKT docker tag. | | docker_workers_xkt_v10_image | "{{ docker_private_registry }}/on-premises/xkt_v10_worker" | Worker XKT v10 er image. | | docker_workers_xkt_v10_tag | "{{ docker_bimdata_tag }}" | Worker XKT v10 er tag. | | docker_workers_preview_image | "{{ docker_private_registry }}/on-premises/viewer_360" | Worker preview docker image. | diff --git a/files/scripts/create_docker_offline.sh b/files/scripts/create_docker_offline.sh index 7974d43..f6df3ab 100755 --- a/files/scripts/create_docker_offline.sh +++ b/files/scripts/create_docker_offline.sh @@ -32,7 +32,6 @@ db_images=( worker_images=( ${src_private_repos}/workers:${src_private_tag} ${src_private_repos}/viewer_360:${src_private_tag} - ${src_private_repos}/xkt_worker:${src_private_tag} ${src_private_repos}/xkt_v10_worker:${src_private_tag} ${src_private_repos}/dwg_worker:${src_private_tag} ${src_private_repos}/image_preview_worker:${src_private_tag} diff --git a/files/scripts/retag_images.sh b/files/scripts/retag_images.sh index f63f973..d301569 100755 --- a/files/scripts/retag_images.sh +++ b/files/scripts/retag_images.sh @@ -21,7 +21,6 @@ img_list=( sso_invitation_email_sender workers viewer_360 - xkt_worker xkt_v10_worker dwg_worker image_preview_worker diff --git a/roles/prepare_vars/defaults/main/applications.yml b/roles/prepare_vars/defaults/main/applications.yml index c93cfa0..64a69a1 100644 --- a/roles/prepare_vars/defaults/main/applications.yml +++ b/roles/prepare_vars/defaults/main/applications.yml @@ -154,11 +154,6 @@ workers_merge_ram: "{{ ansible_memtotal_mb / 2 }}m" workers_merge_task_timeout: "{{ '2h' | community.general.to_seconds | int }}" ## xkt -workers_xkt_instance: 1 -workers_xkt_cpu: 1 -workers_xkt_ram: "{{ ansible_memtotal_mb / 2 }}m" -workers_xkt_task_timeout: "{{ '10min' | community.general.to_seconds | int }}" - workers_xkt_v10_instance: 1 workers_xkt_v10_cpu: 1 workers_xkt_v10_ram: "{{ ansible_memtotal_mb / 2 }}m" diff --git a/roles/prepare_vars/defaults/main/docker_images.yml b/roles/prepare_vars/defaults/main/docker_images.yml index a3a1090..570c304 100644 --- a/roles/prepare_vars/defaults/main/docker_images.yml +++ b/roles/prepare_vars/defaults/main/docker_images.yml @@ -69,9 +69,6 @@ docker_workers_svg_tag: "{{ docker_bimdata_tag }}" docker_workers_merge_image: "{{ docker_private_registry }}/on-premises/workers" docker_workers_merge_tag: "{{ docker_bimdata_tag }}" -docker_workers_xkt_image: "{{ docker_private_registry }}/on-premises/xkt_worker" -docker_workers_xkt_tag: "{{ docker_bimdata_tag }}" - docker_workers_xkt_v10_image: "{{ docker_private_registry }}/on-premises/xkt_v10_worker" docker_workers_xkt_v10_tag: "{{ docker_bimdata_tag }}" diff --git a/roles/prepare_vars/templates/compose_workers.yml.j2 b/roles/prepare_vars/templates/compose_workers.yml.j2 index 3ee3ecb..6822e09 100644 --- a/roles/prepare_vars/templates/compose_workers.yml.j2 +++ b/roles/prepare_vars/templates/compose_workers.yml.j2 @@ -143,34 +143,6 @@ workers-merge: extra_hosts: {{ docker_extra_hosts | to_yaml }} {% endif %} -workers-xkt: - image: {{ docker_workers_xkt_image }}:{{ docker_workers_xkt_tag }} - deploy: - replicas: {{ workers_xkt_instance }} - resources: - limits: - cpus: "{{ workers_xkt_cpu }}" - memory: "{{ workers_xkt_ram }}" - environment: - - RABBITMQ_HOST={{ rabbitmq_host }} - - RABBITMQ_PORT={{ rabbitmq_port }} - - RABBITMQ_USER={{ rabbitmq_user }} - - RABBITMQ_PASSWORD={{ rabbitmq_password }} - - API_URL={{ urls['api'] }} - - ENV={{ app_env }} - - QUEUE=xkt - - TIMEOUT={{ workers_xkt_task_timeout }} - - MASTER_TOKEN={{ master_token }} -{% if tls_custom_ca | bool %} - - CA_CERT=/opt/onprem-ca.crt - volumes: - - {{ bimdata_docker_volume_path }}/ca.crt:/opt/onprem-ca.crt:ro -{% endif %} - restart: unless-stopped -{% if docker_use_extra_hosts | bool %} - extra_hosts: {{ docker_extra_hosts | to_yaml }} -{% endif %} - workers-xkt-v10: image: {{ docker_workers_xkt_v10_image }}:{{ docker_workers_xkt_v10_tag }} deploy: