Skip to content

Commit a3d5f74

Browse files
Enable Chatbot for S4L products (#1221)
* wip * Add csi-s3 and have portainer use it * Change request @Hrytsuk 1GB max portainer volume size * Arch Linux Certificates Customization * Fix pgsql exporter failure * [Kubernetes] Introduce on-prem persistent Storage (Longhorn) 🎉 (#979) * Introduce longhorn chart * Further longhorn configuration * Longhorn: further settings configuration * Fix longhorn configuration bugs Extra: introduce longhorn pv vales for portainer * Add comment for deletion longhorn * Further longhorn configuration * Add README.md for Longhorn wit FAQ * Update Longhorn readme * Update readme * Futher LH configuration * Update LH's Readme * Update Longhorn Readme * Improve LH's Readme * LH: Reduce reserved default disk space to 5% Since we use a dedicated disk for LH, we can go ahead with 5% * Use values to set Longhorn storage class * Update LH's Readme * LH Readme: add requirements reference * PR Review: bring back portainer s3 pv * LH: decrease portinaer volume size * Experimental: Try to add tracing to simcore-traefik on master * Fixes ITISFoundation/osparc-simcore#7363 * Arch Linux Certificates Customization - 2 * Remove frontend vendor chatbot service * wip --------- Co-authored-by: Dustin Kaiser <[email protected]> Co-authored-by: YH <[email protected]>
1 parent 1dc6e20 commit a3d5f74

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

services/vendors/docker-compose.yml.j2

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,7 @@ services:
6363
- traefik.http.services.vendor_chat_backend.loadbalancer.server.port=${VENDOR_CHATBOT_BACKEND_PORT}
6464
- traefik.http.routers.vendor_chat_backend.entrypoints=https
6565
- traefik.http.routers.vendor_chat_backend.tls=true
66-
- traefik.http.routers.vendor_chat_backend.rule=(PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }}))
67-
networks:
68-
- public
69-
chat-frontend:
70-
image: ${VENDOR_CHATBOT_FRONTEND_IMAGE}
71-
init: true
72-
{%- raw %}
73-
hostname: "v-chat-frontend-{{.Node.Hostname}}-{{.Task.Slot}}"
74-
{%- endraw %}
75-
deploy:
76-
replicas: ${VENDOR_CHATBOT_FRONTEND_REPLICAS}
77-
placement:
78-
constraints:
79-
- node.labels.simcore==true
80-
resources:
81-
limits:
82-
cpus: "1.0"
83-
memory: 2.5G
84-
reservations:
85-
cpus: "0.1"
86-
memory: 512M
87-
update_config:
88-
parallelism: 1
89-
order: start-first
90-
failure_action: continue
91-
delay: 10s
92-
labels:
93-
- traefik.enable=true
94-
- traefik.swarm.network=${PUBLIC_NETWORK}
95-
- traefik.http.services.vendor_chat_frontend.loadbalancer.server.port=${VENDOR_CHATBOT_FRONTEND_PORT}
96-
- traefik.http.routers.vendor_chat_frontend.entrypoints=https
97-
- traefik.http.routers.vendor_chat_frontend.tls=true
98-
- traefik.http.routers.vendor_chat_frontend.rule=(!PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_FRONTEND_PRODUCTS, VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX) }}))
99-
- traefik.http.routers.vendor_chat_frontend.middlewares=authenticated_platform_user@swarm
66+
- traefik.http.routers.vendor_chat_backend.rule=(PathPrefix(`/v1/`) && ({{ generate_vendors_traefik_rule(VENDOR_CHATBOT_PRODUCTS, VENDOR_CHATBOT_SUBDOMAIN_PREFIX) }}))
10067
networks:
10168
- public
10269
networks:

services/vendors/template.env

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ VENDOR_MANUAL_PORT=${VENDOR_MANUAL_PORT}
66
VENDOR_CHATBOT_BACKEND_IMAGE=${VENDOR_CHATBOT_BACKEND_IMAGE}
77
VENDOR_CHATBOT_BACKEND_PORT=${VENDOR_CHATBOT_BACKEND_PORT}
88
VENDOR_CHATBOT_BACKEND_REPLICAS=${VENDOR_CHATBOT_BACKEND_REPLICAS}
9-
VENDOR_CHATBOT_FRONTEND_IMAGE=${VENDOR_CHATBOT_FRONTEND_IMAGE}
10-
VENDOR_CHATBOT_FRONTEND_PORT=${VENDOR_CHATBOT_FRONTEND_PORT}
11-
VENDOR_CHATBOT_FRONTEND_PRODUCTS=${VENDOR_CHATBOT_FRONTEND_PRODUCTS}
12-
VENDOR_CHATBOT_FRONTEND_REPLICAS=${VENDOR_CHATBOT_FRONTEND_REPLICAS}
13-
VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_FRONTEND_SUBDOMAIN_PREFIX}
9+
VENDOR_CHATBOT_PRODUCTS=${VENDOR_CHATBOT_PRODUCTS}
10+
VENDOR_CHATBOT_SUBDOMAIN_PREFIX=${VENDOR_CHATBOT_SUBDOMAIN_PREFIX}
1411
PUBLIC_NETWORK=${PUBLIC_NETWORK}
1512
OPENAI_API_KEY=${OPENAI_API_KEY}

0 commit comments

Comments
 (0)