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.

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

add external pgvector #79

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Conversation

FingerLiu
Copy link
Contributor

No description provided.

@BorisPolonsky
Copy link
Owner

Thanks for your contribution. Could you please change target branch to 'dev' instead since we have other on going updates to be merged as well.

@FingerLiu FingerLiu changed the base branch from master to dev June 26, 2024 02:03
@FingerLiu
Copy link
Contributor Author

changed to dev

@@ -232,7 +242,6 @@ MILVUS_PORT: {{ .Values.externalMilvus.port | toString | quote }}
# The milvus password.
# MILVUS_PASSWORD: {{ .Values.externalMilvus.password | quote }}
# The milvus tls switch.
MILVUS_SECURE: {{ .Values.externalMilvus.useTLS | toString | quote }}
Copy link
Owner

@BorisPolonsky BorisPolonsky Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please restore this config@FingerLiu

charts/dify/templates/config.tpl Outdated Show resolved Hide resolved
@FingerLiu
Copy link
Contributor Author

done

BorisPolonsky
BorisPolonsky previously approved these changes Jun 27, 2024
@BorisPolonsky BorisPolonsky dismissed their stale review June 27, 2024 10:43

Not resolved

@BorisPolonsky BorisPolonsky self-requested a review June 27, 2024 10:51
Copy link
Owner

@BorisPolonsky BorisPolonsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FingerLiu
Copy link
Contributor Author

restored Milvus TLS config

@BorisPolonsky BorisPolonsky merged commit 525140e into BorisPolonsky:dev Jul 2, 2024
@BorisPolonsky BorisPolonsky mentioned this pull request Aug 1, 2024
BorisPolonsky added a commit that referenced this pull request Aug 1, 2024
* 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 <BorisPolonsky@users.noreply.github.com>

* Update README.md

---------

Co-authored-by: Pascal M <11357019+perzeuss@users.noreply.github.com>

* 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 <11357019+perzeuss@users.noreply.github.com>
Co-authored-by: Ryan <haoinit@gmail.com>
Co-authored-by: Li Yi <denverdino@gmail.com>
Co-authored-by: FingerLiu <liupeng.dalian@gmail.com>
regnull pushed a commit to regnull/dify-helm that referenced this pull request Dec 30, 2024
* Add Release chart action & bump chart version  (BorisPolonsky#3)

* Add helm chart release logic
* Bump chart version

* Add installation guide (BorisPolonsky#4)

* Fix env clash (BorisPolonsky#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (BorisPolonsky#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (BorisPolonsky#14)

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

* Bump chart version to 0.16.0

* Fix postgres port and database config (BorisPolonsky#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 (BorisPolonsky#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 (BorisPolonsky#31)

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

* Display contributors (BorisPolonsky#33)

* Fix README.md (BorisPolonsky#26)

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

* Add helm chart release logic
* Bump chart version

* Add installation guide (BorisPolonsky#4)

* Fix env clash (BorisPolonsky#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (BorisPolonsky#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (BorisPolonsky#14)

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

* Bump chart version to 0.16.0

* Fix postgres port and database config (BorisPolonsky#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 (BorisPolonsky#30)

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

* Add helm chart release logic
* Bump chart version

* Add installation guide (BorisPolonsky#4)

* Fix env clash (BorisPolonsky#9)

* Fix ENV clashing for some corner case

* Bump chart version to 0.14.1

* Fix label in worker deployment (BorisPolonsky#12)

* Bump chart version to 0.15.0

* 0.3.8 compatibility for core components (BorisPolonsky#14)

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

* Bump chart version to 0.16.0

* Fix postgres port and database config (BorisPolonsky#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 (BorisPolonsky#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 (BorisPolonsky#29)

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

Co-authored-by: Boris Polonsky <BorisPolonsky@users.noreply.github.com>

* Update README.md

---------

Co-authored-by: Pascal M <11357019+perzeuss@users.noreply.github.com>

* 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 BorisPolonsky#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 (BorisPolonsky#74)

* Support Aliyun OSS

* Fix sandbox API_KEY

* add external pgvector (BorisPolonsky#79)

* Dify 0.6.11 compatibility update (BorisPolonsky#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 <11357019+perzeuss@users.noreply.github.com>
Co-authored-by: Ryan <haoinit@gmail.com>
Co-authored-by: Li Yi <denverdino@gmail.com>
Co-authored-by: FingerLiu <liupeng.dalian@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants