Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
c9c70d6
Arch Linux Certificates Customization
mrnicegyu11 Dec 3, 2024
7b8be53
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 5, 2024
bcd61cd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 12, 2024
58e1030
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 13, 2024
ed8d479
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jan 10, 2025
dda6e01
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 4, 2025
f6f4f36
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 25, 2025
5dca5c3
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 13, 2025
4a653ef
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 20, 2025
3a21f0f
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 28, 2025
48fbbca
Fix pgsql exporter failure
mrnicegyu11 Apr 24, 2025
08c57db
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 May 6, 2025
5ecbfec
[Kubernetes] Introduce on-prem persistent Storage (Longhorn) :tada: …
YuryHrytsuk May 6, 2025
3ea41b5
Experimental: Try to add tracing to simcore-traefik on master
mrnicegyu11 May 9, 2025
29f2f2e
Fixes https://github.com/ITISFoundation/osparc-simcore/issues/7363
mrnicegyu11 May 14, 2025
cdef57f
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 May 21, 2025
c0f393e
t push
mrnicegyu11 May 23, 2025
34a86fd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 2, 2025
df3f5df
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 3, 2025
ac44663
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 8, 2025
4100b87
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 21, 2025
1aae4ea
Merge branch 'ITISFoundation:main' into 2025/add/chatVendorService
mrnicegyu11 Jul 21, 2025
f1de711
Add chatbox vendor service
mrnicegyu11 Jul 21, 2025
99b590d
necessary reverts
mrnicegyu11 Jul 21, 2025
f241808
Merge branch 'main' into 2025/add/chatVendorService
mrnicegyu11 Jul 22, 2025
5cb244f
Merge remote-tracking branch 'upstream/main' into 2025/add/chatVendor…
mrnicegyu11 Jul 23, 2025
f0e5eed
Add resources, change names
mrnicegyu11 Jul 23, 2025
ca5e15b
Merge branch 'main' into 2025/add/chatVendorService
mrnicegyu11 Jul 23, 2025
b32e465
Merge branch 'main' into 2025/add/chatVendorService
mrnicegyu11 Jul 23, 2025
642958a
wip
mrnicegyu11 Jul 23, 2025
6ade5ee
Merge branch 'main' into 2025/add/chatVendorService
mrnicegyu11 Jul 24, 2025
06e6e5b
Merge branch 'main' into 2025/add/chatVendorService
mrnicegyu11 Jul 28, 2025
6507bba
Add chat vendor service maintenanec mode
mrnicegyu11 Jul 28, 2025
66b2f63
Merge remote-tracking branch 'upstream/main' into 2025/add/chatVendor…
mrnicegyu11 Jul 29, 2025
777875a
wip
mrnicegyu11 Jul 29, 2025
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
54 changes: 41 additions & 13 deletions services/vendors/docker-compose.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
manual:
image: ${VENDOR_MANUAL_IMAGE}
Expand Down Expand Up @@ -34,16 +32,16 @@ services:
- traefik.http.routers.vendor_manual.middlewares=ops_gzip@swarm, authenticated_platform_user@swarm
networks:
- public
chat:
image: ${VENDOR_CHATBOT_IMAGE}
chat-backend:
image: ${VENDOR_CHATBOT_BACKEND_IMAGE}
init: true
env_file:
- .env
{%- raw %}
hostname: "v-chat-{{.Node.Hostname}}-{{.Task.Slot}}"
hostname: "v-chat-backend-{{.Node.Hostname}}-{{.Task.Slot}}"
{%- endraw %}
deploy:
replicas: ${VENDOR_CHATBOT_REPLICAS}
replicas: ${VENDOR_CHATBOT_BACKEND_REPLICAS}
placement:
constraints:
- node.labels.simcore==true
Expand All @@ -62,13 +60,43 @@ services:
labels:
- traefik.enable=true
- traefik.swarm.network=${PUBLIC_NETWORK}
- traefik.http.services.vendor_chat.loadbalancer.server.port=${VENDOR_CHATBOT_PORT}
- traefik.http.routers.vendor_chat.entrypoints=https
- traefik.http.routers.vendor_chat.tls=true
- traefik.http.routers.vendor_chat.rule={{ generate_vendors_traefik_rule(VENDOR_CHATBOT_PRODUCTS, VENDOR_CHATBOT_SUBDOMAIN_PREFIX) }}
- traefik.http.routers.vendor_chat.middlewares=authenticated_platform_user@swarm
- prometheus-job=vendor-chat
- prometheus-port=8000
- traefik.http.services.vendor_chat_backend.loadbalancer.server.port=${VENDOR_CHATBOT_BACKEND_PORT}
- traefik.http.routers.vendor_chat_backend.entrypoints=https
- traefik.http.routers.vendor_chat_backend.tls=true
- traefik.http.routers.vendor_chat_backend.rule=(PathPrefix(`/v1/`) && {{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }})
networks:
- public
chat-frontend:
image: ${VENDOR_CHATBOT_FRONTEND_IMAGE}
init: true
{%- raw %}
hostname: "v-chat-frontend-{{.Node.Hostname}}-{{.Task.Slot}}"
{%- endraw %}
deploy:
replicas: ${VENDOR_CHATBOT_FRONTEND_REPLICAS}
placement:
constraints:
- node.labels.simcore==true
resources:
limits:
cpus: "1.0"
memory: 2.5G
reservations:
cpus: "0.1"
memory: 512M
update_config:
parallelism: 1
order: start-first
failure_action: continue
delay: 10s
labels:
- traefik.enable=true
- traefik.swarm.network=${PUBLIC_NETWORK}
- traefik.http.services.vendor_chat_frontend.loadbalancer.server.port=${VENDOR_CHATBOT_FRONTEND_PORT}
- traefik.http.routers.vendor_chat_frontend.entrypoints=https
- traefik.http.routers.vendor_chat_frontend.tls=true
- traefik.http.routers.vendor_chat_frontend.rule=(!PathPrefix(`/v1/`) && {{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }})
- traefik.http.routers.vendor_chat_frontend.middlewares=authenticated_platform_user@swarm
networks:
- public
networks:
Expand Down
13 changes: 8 additions & 5 deletions services/vendors/template.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ VENDOR_MANUAL_REPLICAS=${VENDOR_MANUAL_REPLICAS}
VENDOR_MANUAL_SUBDOMAIN_PREFIX=${VENDOR_MANUAL_SUBDOMAIN_PREFIX}
VENDOR_MANUAL_PRODUCTS=${VENDOR_MANUAL_PRODUCTS}
VENDOR_MANUAL_PORT=${VENDOR_MANUAL_PORT}
VENDOR_CHATBOT_IMAGE=${VENDOR_CHATBOT_IMAGE}
VENDOR_CHATBOT_REPLICAS=${VENDOR_CHATBOT_REPLICAS}
VENDOR_CHATBOT_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_SUBDOMAIN_PREFIX}
VENDOR_CHATBOT_PRODUCTS=${VENDOR_CHATBOT_PRODUCTS}
VENDOR_CHATBOT_PORT=${VENDOR_CHATBOT_PORT}
VENDOR_CHATBOT_BACKEND_IMAGE=${VENDOR_CHATBOT_BACKEND_IMAGE}
VENDOR_CHATBOT_BACKEND_PORT=${VENDOR_CHATBOT_BACKEND_PORT}
VENDOR_CHATBOT_BACKEND_REPLICAS=${VENDOR_CHATBOT_BACKEND_REPLICAS}
VENDOR_CHATBOT_FRONTEND_IMAGE=${VENDOR_CHATBOT_FRONTEND_IMAGE}
VENDOR_CHATBOT_FRONTEND_PORT=${VENDOR_CHATBOT_FRONTEND_PORT}
VENDOR_CHATBOT_FRONTEND_PRODUCTS=${VENDOR_CHATBOT_FRONTEND_PRODUCTS}
VENDOR_CHATBOT_FRONTEND_REPLICAS=${VENDOR_CHATBOT_FRONTEND_REPLICAS}
VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX}
PUBLIC_NETWORK=${PUBLIC_NETWORK}
OPENAI_API_KEY=${OPENAI_API_KEY}
Loading