From a0331a544a3b44b772886c1ea2d083e4bb1613d5 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 16 Sep 2024 20:50:14 +0700 Subject: [PATCH 1/5] Update self-host to Huly v295 Signed-off-by: Alexander Onnikov --- setup.sh | 2 +- template.compose.yaml | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/setup.sh b/setup.sh index 3ae147d..1f42cda 100755 --- a/setup.sh +++ b/setup.sh @@ -4,4 +4,4 @@ echo "Setting Huly Server Address: $SERVER_ADDRESS" envsubst < template.conf > nginx.conf envsubst < template.env > .env -./use-version.sh v0.6.280 +./use-version.sh v0.6.295 diff --git a/template.compose.yaml b/template.compose.yaml index 93ffca2..2046a19 100644 --- a/template.compose.yaml +++ b/template.compose.yaml @@ -1,4 +1,4 @@ -version: "3" +name: huly-selfhost services: mongodb: image: "mongo:7-jammy" @@ -57,11 +57,25 @@ services: - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin - FRONT_URL=http://front:8080 - - INIT_WORKSPACE=demo-tracker - MODEL_ENABLED=* - ACCOUNTS_URL=http://${SERVER_ADDRESS}:3000 - ACCOUNT_PORT=3000 restart: unless-stopped + workspace: + image: hardcoreeng/workspace:${HULY_VERSION} + links: + - mongodb + - minio + environment: + - SERVER_SECRET=secret + - MONGO_URL=mongodb://mongodb:27017 + - TRANSACTOR_URL=ws://transactor:3333;ws://${SERVER_ADDRESS}:3333 + - MINIO_ENDPOINT=minio + - MINIO_ACCESS_KEY=minioadmin + - MINIO_SECRET_KEY=minioadmin + - MODEL_ENABLED=* + - ACCOUNTS_URL=http://account:3000 + restart: unless-stopped front: image: hardcoreeng/front:${HULY_VERSION} links: @@ -83,7 +97,6 @@ services: - UPLOAD_URL=/files - ELASTIC_URL=http://elastic:9200 - COLLABORATOR_URL=ws://${SERVER_ADDRESS}:3078 - - COLLABORATOR_API_URL=http://${SERVER_ADDRESS}:3078 - MINIO_ENDPOINT=minio - MINIO_ACCESS_KEY=minioadmin - MINIO_SECRET_KEY=minioadmin @@ -104,7 +117,6 @@ services: - COLLABORATOR_PORT=3078 - SECRET=secret - ACCOUNTS_URL=http://account:3000 - - UPLOAD_URL=/files - MONGO_URL=mongodb://mongodb:27017 - MINIO_ENDPOINT=minio - MINIO_ACCESS_KEY=minioadmin @@ -137,7 +149,6 @@ services: - SERVER_PROVIDER=ws - ACCOUNTS_URL=http://account:3000 - LAST_NAME_FIRST=true - - UPLOAD_URL=http://${SERVER_ADDRESS}/files restart: unless-stopped rekoni: image: hardcoreeng/rekoni-service:${HULY_VERSION} From 8caca409a20e30ad1cc27a7eac015ed569f04ed6 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 16 Sep 2024 20:57:28 +0700 Subject: [PATCH 2/5] Update self-host kube example to Huly v295 Signed-off-by: Alexander Onnikov --- kube/account/account-deployment.yaml | 2 +- .../collaborator/collaborator-deployment.yaml | 4 -- kube/front/front-deployment.yaml | 5 -- kube/transactor/transactor-deployment.yaml | 2 - kube/workspace/workspace-deployment.yaml | 55 +++++++++++++++++++ 5 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 kube/workspace/workspace-deployment.yaml diff --git a/kube/account/account-deployment.yaml b/kube/account/account-deployment.yaml index a719b1f..e54d917 100644 --- a/kube/account/account-deployment.yaml +++ b/kube/account/account-deployment.yaml @@ -56,7 +56,7 @@ spec: name: huly-secret key: SERVER_SECRET - name: TRANSACTOR_URL - value: ws://transactor/ + value: ws://transactor:3333;ws://localhost:3333 - name: ENDPOINT_URL valueFrom: configMapKeyRef: diff --git a/kube/collaborator/collaborator-deployment.yaml b/kube/collaborator/collaborator-deployment.yaml index bb96718..360d04a 100644 --- a/kube/collaborator/collaborator-deployment.yaml +++ b/kube/collaborator/collaborator-deployment.yaml @@ -45,10 +45,6 @@ spec: secretKeyRef: name: huly-secret key: SERVER_SECRET - - name: TRANSACTOR_URL - value: ws://transactor/ - - name: UPLOAD_URL - value: /files image: hardcoreeng/collaborator:latest name: collaborator ports: diff --git a/kube/front/front-deployment.yaml b/kube/front/front-deployment.yaml index 0b2f773..7ceac45 100644 --- a/kube/front/front-deployment.yaml +++ b/kube/front/front-deployment.yaml @@ -78,11 +78,6 @@ spec: value: http://telegram:8086 - name: TITLE value: Huly Self Hosted - - name: TRANSACTOR_URL - valueFrom: - configMapKeyRef: - name: huly-config - key: TRANSACTOR_URL - name: UPLOAD_URL value: /files image: hardcoreeng/front:latest diff --git a/kube/transactor/transactor-deployment.yaml b/kube/transactor/transactor-deployment.yaml index 7061fd4..98fd109 100644 --- a/kube/transactor/transactor-deployment.yaml +++ b/kube/transactor/transactor-deployment.yaml @@ -66,8 +66,6 @@ spec: secretKeyRef: name: huly-secret key: SERVER_SECRET - - name: UPLOAD_URL - value: /files image: hardcoreeng/transactor:latest name: transactor ports: diff --git a/kube/workspace/workspace-deployment.yaml b/kube/workspace/workspace-deployment.yaml new file mode 100644 index 0000000..f4194ba --- /dev/null +++ b/kube/workspace/workspace-deployment.yaml @@ -0,0 +1,55 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: workspace + name: workspace +spec: + replicas: 1 + selector: + matchLabels: + app: workspace + template: + metadata: + labels: + app: workspace + spec: + containers: + - env: + - name: ACCOUNTS_URL + value: http://account + - name: MINIO_ACCESS_KEY + valueFrom: + secretKeyRef: + name: huly-secret + key: MINIO_ACCESS_KEY + - name: MINIO_ENDPOINT + valueFrom: + configMapKeyRef: + name: huly-config + key: MINIO_ENDPOINT + - name: MINIO_SECRET_KEY + valueFrom: + secretKeyRef: + name: huly-secret + key: MINIO_SECRET_KEY + - name: MODEL_ENABLED + value: '*' + - name: MONGO_URL + valueFrom: + configMapKeyRef: + name: huly-config + key: MONGO_URL + - name: SERVER_SECRET + valueFrom: + secretKeyRef: + name: huly-secret + key: SERVER_SECRET + - name: TRANSACTOR_URL + value: ws://transactor:3333;ws://localhost:3333 + image: hardcoreeng/workspace:latest + name: workspace + resources: + limits: + memory: "512M" + restartPolicy: Always From 540ae22d23fe7dc749a523dee117c632353bff46 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 16 Sep 2024 23:02:58 +0700 Subject: [PATCH 3/5] Replace MINIO ENV variables with STORAGE_CONFIG Signed-off-by: Alexander Onnikov --- template.compose.yaml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/template.compose.yaml b/template.compose.yaml index 2046a19..913814f 100644 --- a/template.compose.yaml +++ b/template.compose.yaml @@ -53,9 +53,7 @@ services: - SERVER_SECRET=secret - MONGO_URL=mongodb://mongodb:27017 - TRANSACTOR_URL=ws://transactor:3333;ws://${SERVER_ADDRESS}:3333 - - MINIO_ENDPOINT=minio - - MINIO_ACCESS_KEY=minioadmin - - MINIO_SECRET_KEY=minioadmin + - STORAGE_CONFIG=minio|localhost?accessKey=minioadmin&secretKey=minioadmin - FRONT_URL=http://front:8080 - MODEL_ENABLED=* - ACCOUNTS_URL=http://${SERVER_ADDRESS}:3000 @@ -70,9 +68,7 @@ services: - SERVER_SECRET=secret - MONGO_URL=mongodb://mongodb:27017 - TRANSACTOR_URL=ws://transactor:3333;ws://${SERVER_ADDRESS}:3333 - - MINIO_ENDPOINT=minio - - MINIO_ACCESS_KEY=minioadmin - - MINIO_SECRET_KEY=minioadmin + - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin - MODEL_ENABLED=* - ACCOUNTS_URL=http://account:3000 restart: unless-stopped @@ -97,9 +93,7 @@ services: - UPLOAD_URL=/files - ELASTIC_URL=http://elastic:9200 - COLLABORATOR_URL=ws://${SERVER_ADDRESS}:3078 - - MINIO_ENDPOINT=minio - - MINIO_ACCESS_KEY=minioadmin - - MINIO_SECRET_KEY=minioadmin + - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin - MONGO_URL=mongodb://mongodb:27017 - TITLE=Huly Self Hosted - DEFAULT_LANGUAGE=en @@ -118,9 +112,7 @@ services: - SECRET=secret - ACCOUNTS_URL=http://account:3000 - MONGO_URL=mongodb://mongodb:27017 - - MINIO_ENDPOINT=minio - - MINIO_ACCESS_KEY=minioadmin - - MINIO_SECRET_KEY=minioadmin + - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin restart: unless-stopped transactor: image: hardcoreeng/transactor:${HULY_VERSION} @@ -141,9 +133,7 @@ services: - MONGO_URL=mongodb://mongodb:27017 - METRICS_CONSOLE=false - METRICS_FILE=metrics.txt - - MINIO_ENDPOINT=minio - - MINIO_ACCESS_KEY=minioadmin - - MINIO_SECRET_KEY=minioadmin + - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin - REKONI_URL=http://rekoni:4004 - FRONT_URL=http://${SERVER_ADDRESS}:8087 - SERVER_PROVIDER=ws From ed051cdb99e5a16f855c910038ebaaf3ba5addbd Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 16 Sep 2024 23:06:44 +0700 Subject: [PATCH 4/5] Set NOTIFY_INBOX_ONLY to workspace service Signed-off-by: Alexander Onnikov --- template.compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template.compose.yaml b/template.compose.yaml index 913814f..6a11ef4 100644 --- a/template.compose.yaml +++ b/template.compose.yaml @@ -71,6 +71,7 @@ services: - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin - MODEL_ENABLED=* - ACCOUNTS_URL=http://account:3000 + - NOTIFY_INBOX_ONLY=true restart: unless-stopped front: image: hardcoreeng/front:${HULY_VERSION} From 8055d2e45deb1b4b964a750a2e0dc319c0f37c4e Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 16 Sep 2024 23:23:51 +0700 Subject: [PATCH 5/5] Set NOTIFY_INBOX_ONLY to workspace service kube Signed-off-by: Alexander Onnikov --- kube/workspace/workspace-deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kube/workspace/workspace-deployment.yaml b/kube/workspace/workspace-deployment.yaml index f4194ba..6660c40 100644 --- a/kube/workspace/workspace-deployment.yaml +++ b/kube/workspace/workspace-deployment.yaml @@ -47,6 +47,8 @@ spec: key: SERVER_SECRET - name: TRANSACTOR_URL value: ws://transactor:3333;ws://localhost:3333 + - name: NOTIFY_INBOX_ONLY + value: true image: hardcoreeng/workspace:latest name: workspace resources: