Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Aliyun OSS #74

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Support Aliyun OSS #74

merged 2 commits into from
Jun 6, 2024

Conversation

denverdino
Copy link
Contributor

Support Alibaba Cloud OSS as external storage

@BorisPolonsky
Copy link
Owner

Thanks for your contribution. I'm currently very busy and my k8s dev environment went down hence I have to review this later. Sorry for the delay.

@BorisPolonsky
Copy link
Owner

LGTM. Since we need to further adjust some comments and precedence of the configuration in .Values.yaml and we have other features that need to be overhauled, could you please merge into dev branch instead? Thank you.

@denverdino denverdino changed the base branch from master to dev June 6, 2024 03:05
@denverdino
Copy link
Contributor Author

Thanks for your review. I changed the base branch to dev.

@BorisPolonsky BorisPolonsky merged commit 44307a5 into BorisPolonsky:dev Jun 6, 2024
@BorisPolonsky
Copy link
Owner

@denverdino Could you please confirm if OSS were officially supported by dify. There's no such environment variables in their exemplar docker-compoese.yaml

@denverdino
Copy link
Contributor Author

@BorisPolonsky Yes, it is defined in
https://github.com/langgenius/dify/blob/main/api/config.py#L245

And examples in
https://github.com/langgenius/dify/blob/main/api/.env.example#L57

and I tested it for a while and fixed few issues months ago. langgenius/dify#4425

@BorisPolonsky
Copy link
Owner

Noted. It would be advisable if you would also add these configuration to their docker-compose.yaml as we aim to maintain compatibility based on that file.

@denverdino
Copy link
Contributor Author

langgenius/dify#5366

The PR has been merged.

@BorisPolonsky BorisPolonsky mentioned this pull request Aug 1, 2024
Merged
BorisPolonsky added a commit that referenced this pull request Aug 1, 2024
@BorisPolonsky @perzeuss
@kaktos @denverdino @FingerLiu
Update to 0.6.11 (#84)
cc71bb7 
* Add Release chart action & bump chart version  (#3)

* Add helm chart release logic
* Bump chart version

* Add installation guide (#4)

* Fix env clash (#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (#14)

- Fix compatibility issue with URL related ENV introduced in `0.3.8` 
  - langgenius/dify#648
  - #11

* Bump chart version to 0.16.0

* Fix postgres port and database config (#18)

- Fix port configuration when external postgres exposes port other than 5432
- Fix database conofiguration when utilizing external postgres

* Update Chart.yaml

Bump version to 0.16.1

* Update README.md

Fix grammar

* Create LICENSE

* Update README.md

Add download badge

* Update README.md

* Dify 0.4.9 support (#28)

* Add new environment variables to templates

* Update nginx routing

* Remove redundant environment vairables

* Update milvus config

* Update URL setting

* Quote environment variables

* Update README.md

* Bump chart version to 0.17.0

* Update mail config

* Remove redundant extraEnv

* Bump appVersion to 0.4.9

* Update README.md (#31)

* Revert "Update README.md" (#32)

* Display contributors (#33)

* Fix README.md (#26)

* Add Release chart action & bump chart version  (#3)

* Add helm chart release logic
* Bump chart version

* Add installation guide (#4)

* Fix env clash (#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (#14)

- Fix compatibility issue with URL related ENV introduced in `0.3.8` 
  - langgenius/dify#648
  - #11

* Bump chart version to 0.16.0

* Fix postgres port and database config (#18)

- Fix port configuration when external postgres exposes port other than 5432
- Fix database conofiguration when utilizing external postgres

* Update Chart.yaml

Bump version to 0.16.1

* Update README.md

Fix grammar

* Create LICENSE

* Update README.md

Add download badge

* Update README.md

* Dify 0.4.9 Compatibility (#30)

* Add Release chart action & bump chart version  (#3)

* Add helm chart release logic
* Bump chart version

* Add installation guide (#4)

* Fix env clash (#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (#14)

- Fix compatibility issue with URL related ENV introduced in `0.3.8` 
  - langgenius/dify#648
  - #11

* Bump chart version to 0.16.0

* Fix postgres port and database config (#18)

- Fix port configuration when external postgres exposes port other than 5432
- Fix database conofiguration when utilizing external postgres

* Update Chart.yaml

Bump version to 0.16.1

* Update README.md

Fix grammar

* Create LICENSE

* Update README.md

Add download badge

* Update README.md

* Dify 0.4.9 support (#28)

* Add new environment variables to templates

* Update nginx routing

* Remove redundant environment vairables

* Update milvus config

* Update URL setting

* Quote environment variables

* Update README.md

* Bump chart version to 0.17.0

* Update mail config

* Remove redundant extraEnv

* Bump appVersion to 0.4.9

* feat: add files path to nginx proxy config (#29)

Resolves the issue of files not being available in the frontend, e.g. DALL-E generated images.

Co-authored-by: Boris Polonsky <[email protected]>

* Update README.md

---------

Co-authored-by: Pascal M <[email protected]>

* Update release condition

* Update values.yaml

Update comments on vector db in values.yaml

* Update values.yaml

Grammar fix

* Fix ConfigMap error when `.Values.externalMilvus.enable=true`

* Fix nginx duplicate location: "/files"

* Bump Chart version to 0.17.1

* Optimize extraEnv configuration

* Bump Chart Version to 0.17.2

* Change chart version to 0.17.2-rc1

* Bump chart version to 0.17.2

* add quote to QDRANT_CLIENT_TIMEOUT/consoleApi/appApi #45

lack of quote cause creating configmap error

* Rename port in service as name: `<protocol>[-<suffix>]` format and make them compatible with explicit protocol selection in `istio`

* Bump Chart version to 0.18.0

* Update comment

* 0.5.11 compatiblity update

* Update PVC definition logic in `api` and `worker`

* Update comment on custom environment variables

* Fix log level definition in `worker`

* Dify 0.6.3 compatibility (WIP)

* Update indentation of `envFrom` in `web`, `worker` and `api`

* Corrected port config and remove redundant template in deployment `sandbox`

* Fix incorrect variable type in `config.tpl`

* Fix value reference in credentials.tpl

* Add secret for `sandbox`

* Removed existingSecret related config in section `sandbox` in `values.yaml`

* Rename template

* Add and mount secret for `api` and `worker`

* Removed credentials from configmap

* Removed hard-coded config for sandbox in `config.tpl`

* Fix typo and correct priviledge escalation config for sandbox

* Corrected `appVersion`

* Corrected typo

* Support Aliyun OSS (#74)

* Support Aliyun OSS

* Fix sandbox API_KEY

* add external pgvector (#79)

* Dify 0.6.11 compatibility update (#81)

* Add ssrf_poroxy (WIP)

* Fix squid image configuration

* Complete squid log and routing config

* Remove `squid` cache

* Include `ssrf_proxy` configuration in `api`

* Add `CODE_EXECUTION_API_KEY` in `api`

* Update configuration of sandbox

- Added `ssrf_proxy` support
- Overhauled `dify.sandbox.fullname` definition

* Fix ssrf proxy configuration in `api`

* Restore ssrf_proxy default confiuration after unit tests

* Breaking Change: Update default SMTP configuration and layout in `.Values.api`

* Update priority and comment of exteranal storage configuration

* Update external qdrant configuartion

* Update priority of `pgvector`

* Update priority of `aliyun_oss`

* Update order of object storage types in `values.yaml`

* Update order of vector db in `values.yaml`

---------

Co-authored-by: Pascal M <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Li Yi <[email protected]>
Co-authored-by: FingerLiu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@denverdino @BorisPolonsky