Skip to content

Commit 1325c32

Browse files
authored
Qfix: revert datalake (#195)
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
1 parent 006762f commit 1325c32

9 files changed

Lines changed: 4 additions & 105 deletions

File tree

.github/workflows/main.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
echo 127.0.0.1 account.huly.example | sudo tee -a /etc/hosts
6666
echo 127.0.0.1 transactor.huly.example | sudo tee -a /etc/hosts
6767
echo 127.0.0.1 collaborator.huly.example | sudo tee -a /etc/hosts
68-
echo 127.0.0.1 datalake.huly.example | sudo tee -a /etc/hosts
6968
kubectl apply -R -f .
7069
kubectl wait --for=condition=Available deployment/cockroachdb-single-node --timeout 3m
7170
kubectl wait --for=condition=Available deployment/transactor --timeout 3m

MIGRATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Migration Steps (command examples shown for Docker on macOS):
4747
--network "${DOCKER_NAME}_default" \
4848
-e SERVER_SECRET="$SECRET" \
4949
-e TRANSACTOR_URL="ws://transactor:3333" \
50-
-e STORAGE_CONFIG="datalake|http://datalake:4030" \
50+
-e STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin" \
5151
-e ACCOUNT_DB_URL="${CR_DB_URL}" \
5252
-e ACCOUNTS_URL="http://account:3000" \
5353
-e DB_URL="${CR_DB_URL}" \

kube/QUICKSTART.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ echo "127.0.0.1 huly.example" | sudo tee -a /etc/hosts
6565
echo "127.0.0.1 account.huly.example" | sudo tee -a /etc/hosts
6666
echo "127.0.0.1 transactor.huly.example" | sudo tee -a /etc/hosts
6767
echo "127.0.0.1 collaborator.huly.example" | sudo tee -a /etc/hosts
68-
echo "127.0.0.1 datalake.huly.example" | sudo tee -a /etc/hosts
6968
```
7069

7170
Deploy Huly with `kubectl`:

kube/config/config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ data:
1313
MONGO_URL: 'mongodb://mongodb:27017'
1414
ELASTIC_URL: 'http://elastic:9200'
1515
ELASTIC_INDEX_NAME: 'huly_storage_index'
16-
filesUrl: 'http://datalake.huly.example/blob/:workspace/:blobId/:filename'
17-
uploadUrl: 'http://datalake.huly.example/upload/form-data/:workspace'
18-
previewConfig: 'image|http://datalake.huly.example/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|http://datalake.huly.example/meta/:workspace/:blobId'

kube/config/secret.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ metadata:
55
type: Opaque
66
stringData:
77
SERVER_SECRET: secret
8-
STORAGE_CONFIG: datalake|http://datalake
8+
STORAGE_CONFIG: minio|minio?accessKey=minioadmin&secretKey=minioadmin
99
COCKROACH_PASSWORD: cockroach_user_secret
1010
REDPANDA_SUPERUSER_PASSWORD: superpassword
11-
CR_DB_URL: postgres://selfhost:cockroach_user_secret@cockroach:26257/defaultdb
12-
datalakeStorageConfig: huly,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin
11+
CR_DB_URL: postgres://selfhost:cockroach_user_secret@cockroach:26257/defaultdb

kube/datalake/datalake-deployment.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

kube/datalake/datalake-ingress.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

kube/datalake/datalake-service.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

kube/front/front-deployment.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,8 @@ spec:
6565
value: http://telegram:8086
6666
- name: TITLE
6767
value: Huly Self Hosted
68-
- name: FILES_URL
69-
valueFrom:
70-
configMapKeyRef:
71-
name: huly-config
72-
key: filesUrl
7368
- name: UPLOAD_URL
74-
valueFrom:
75-
configMapKeyRef:
76-
name: huly-config
77-
key: uploadUrl
78-
- name: PREVIEW_CONFIG
79-
valueFrom:
80-
configMapKeyRef:
81-
name: huly-config
82-
key: previewConfig
69+
value: /files
8370
- name: STATS_URL
8471
value: http://stats
8572
- name: DESKTOP_UPDATES_CHANNEL

0 commit comments

Comments
 (0)