diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 28d8afe..f829b57 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -65,7 +65,6 @@ jobs: echo 127.0.0.1 account.huly.example | sudo tee -a /etc/hosts echo 127.0.0.1 transactor.huly.example | sudo tee -a /etc/hosts echo 127.0.0.1 collaborator.huly.example | sudo tee -a /etc/hosts - echo 127.0.0.1 datalake.huly.example | sudo tee -a /etc/hosts kubectl apply -R -f . kubectl wait --for=condition=Available deployment/cockroachdb-single-node --timeout 3m kubectl wait --for=condition=Available deployment/transactor --timeout 3m diff --git a/MIGRATION.md b/MIGRATION.md index 8282baa..8d36ccb 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -47,7 +47,7 @@ Migration Steps (command examples shown for Docker on macOS): --network "${DOCKER_NAME}_default" \ -e SERVER_SECRET="$SECRET" \ -e TRANSACTOR_URL="ws://transactor:3333" \ - -e STORAGE_CONFIG="datalake|http://datalake:4030" \ + -e STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin" \ -e ACCOUNT_DB_URL="${CR_DB_URL}" \ -e ACCOUNTS_URL="http://account:3000" \ -e DB_URL="${CR_DB_URL}" \ diff --git a/kube/QUICKSTART.md b/kube/QUICKSTART.md index a901a6f..839995f 100644 --- a/kube/QUICKSTART.md +++ b/kube/QUICKSTART.md @@ -65,7 +65,6 @@ echo "127.0.0.1 huly.example" | sudo tee -a /etc/hosts echo "127.0.0.1 account.huly.example" | sudo tee -a /etc/hosts echo "127.0.0.1 transactor.huly.example" | sudo tee -a /etc/hosts echo "127.0.0.1 collaborator.huly.example" | sudo tee -a /etc/hosts -echo "127.0.0.1 datalake.huly.example" | sudo tee -a /etc/hosts ``` Deploy Huly with `kubectl`: diff --git a/kube/config/config.yaml b/kube/config/config.yaml index 43ff0fa..257e28d 100644 --- a/kube/config/config.yaml +++ b/kube/config/config.yaml @@ -13,6 +13,3 @@ data: MONGO_URL: 'mongodb://mongodb:27017' ELASTIC_URL: 'http://elastic:9200' ELASTIC_INDEX_NAME: 'huly_storage_index' - filesUrl: 'http://datalake.huly.example/blob/:workspace/:blobId/:filename' - uploadUrl: 'http://datalake.huly.example/upload/form-data/:workspace' - 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' diff --git a/kube/config/secret.yaml b/kube/config/secret.yaml index 6cc1456..e95e3cf 100644 --- a/kube/config/secret.yaml +++ b/kube/config/secret.yaml @@ -5,8 +5,7 @@ metadata: type: Opaque stringData: SERVER_SECRET: secret - STORAGE_CONFIG: datalake|http://datalake + STORAGE_CONFIG: minio|minio?accessKey=minioadmin&secretKey=minioadmin COCKROACH_PASSWORD: cockroach_user_secret REDPANDA_SUPERUSER_PASSWORD: superpassword - CR_DB_URL: postgres://selfhost:cockroach_user_secret@cockroach:26257/defaultdb - datalakeStorageConfig: huly,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin \ No newline at end of file + CR_DB_URL: postgres://selfhost:cockroach_user_secret@cockroach:26257/defaultdb \ No newline at end of file diff --git a/kube/datalake/datalake-deployment.yaml b/kube/datalake/datalake-deployment.yaml deleted file mode 100644 index fe33b2c..0000000 --- a/kube/datalake/datalake-deployment.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: datalake - name: datalake -spec: - replicas: 1 - selector: - matchLabels: - app: datalake - template: - metadata: - labels: - app: datalake - spec: - containers: - - image: hardcoreeng/datalake:s0.7.204 - name: datalake - ports: - - containerPort: 3000 - env: - - name: PORT - value: '4030' - - name: SECRET - valueFrom: - secretKeyRef: - name: huly-secret - key: SERVER_SECRET - - name: ACCOUNTS_URL - value: http://account - - name: STATS_URL - value: http://stats - - name: DB_URL - valueFrom: - secretKeyRef: - name: huly-secret - key: CR_DB_URL - - name: BUCKETS - valueFrom: - secretKeyRef: - name: huly-secret - key: datalakeStorageConfig - - name: QUEUE_CONFIG - value: redpanda:9092 - resources: - limits: - memory: "512M" - restartPolicy: Always diff --git a/kube/datalake/datalake-ingress.yaml b/kube/datalake/datalake-ingress.yaml deleted file mode 100644 index 1a745cf..0000000 --- a/kube/datalake/datalake-ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - labels: - app: datalake - name: datalake -spec: - ingressClassName: nginx - rules: - - host: datalake.huly.example - http: - paths: - - backend: - service: - name: datalake - port: - number: 80 - path: / - pathType: Prefix diff --git a/kube/datalake/datalake-service.yaml b/kube/datalake/datalake-service.yaml deleted file mode 100644 index 8430adc..0000000 --- a/kube/datalake/datalake-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: datalake - name: datalake -spec: - ports: - - port: 80 - targetPort: 4030 - selector: - app: datalake diff --git a/kube/front/front-deployment.yaml b/kube/front/front-deployment.yaml index f951dcb..ccdeaaf 100644 --- a/kube/front/front-deployment.yaml +++ b/kube/front/front-deployment.yaml @@ -65,21 +65,8 @@ spec: value: http://telegram:8086 - name: TITLE value: Huly Self Hosted - - name: FILES_URL - valueFrom: - configMapKeyRef: - name: huly-config - key: filesUrl - name: UPLOAD_URL - valueFrom: - configMapKeyRef: - name: huly-config - key: uploadUrl - - name: PREVIEW_CONFIG - valueFrom: - configMapKeyRef: - name: huly-config - key: previewConfig + value: /files - name: STATS_URL value: http://stats - name: DESKTOP_UPDATES_CHANNEL