Skip to content

Commit

Permalink
first cut at redis (onyx-dot-app#2226)
Browse files Browse the repository at this point in the history
* first cut at redis

* fix startup dependencies on redis

* kombu cleanup - fail silently

* mypy

* add redis_host environment override

* update REDIS_HOST env var in docker-compose.dev.yml

* update the rest of the docker files

* update contributing guide

* renaming cache to cache_volume

* add redis password to various deployments

* try setting up pr testing for helm

* fix indent

* hopefully this release version actually exists

* fix command line option to --chart-dirs

* fetch-depth 0

* edit values.yaml

* try setting ct working directory

* bypass testing only on change for now

* move files and lint them

* update helm testing

* some issues suggest using --config works

* add vespa repo

* add postgresql repo

* increase timeout

* try amd64 runner

* fix redis password reference

* add comment to helm chart testing workflow

* rename helm testing workflow to disable it

---------

Co-authored-by: Richard Kuo <rkuo@rkuo.com>
  • Loading branch information
2 people authored and rajiv chodisetti committed Oct 2, 2024
1 parent fbce2ca commit 39a8764
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 21 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/pr-helm-chart-testing.yml.disabled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,9 @@ jobs:
backend/requirements/model_server.txt
- run: |
python -m pip install --upgrade pip
<<<<<<< HEAD
pip install --retries 5 --timeout 30 -r backend/requirements/default.txt
pip install --retries 5 --timeout 30 -r backend/requirements/dev.txt
pip install --retries 5 --timeout 30 -r backend/requirements/model_server.txt
=======
pip install -r backend/requirements/default.txt
pip install -r backend/requirements/dev.txt
pip install -r backend/requirements/model_server.txt
>>>>>>> 6daea805 (first cut at redis (#2226))

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.1
Expand Down
2 changes: 1 addition & 1 deletion backend/danswer/configs/app_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,4 +391,4 @@
# Slack community (https://join.slack.com/t/danswer/shared_invite/zt-1w76msxmd-HJHLe3KNFIAIzk_0dSOKaQ)
ENTERPRISE_EDITION_ENABLED = (
os.environ.get("ENABLE_PAID_ENTERPRISE_EDITION_FEATURES", "").lower() == "true"
)
)
1 change: 0 additions & 1 deletion deployment/docker_compose/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ services:
- NOTIFY_SLACKBOT_NO_ANSWER=${NOTIFY_SLACKBOT_NO_ANSWER:-}
- DANSWER_BOT_MAX_QPM=${DANSWER_BOT_MAX_QPM:-}
- DANSWER_BOT_MAX_WAIT_TIME=${DANSWER_BOT_MAX_WAIT_TIME:-}
- CUSTOM_REFRESH_URL=${CUSTOM_REFRESH_URL:-}
# Logging
# Leave this on pretty please? Nothing sensitive is collected!
# https://docs.danswer.dev/more/telemetry
Expand Down
3 changes: 1 addition & 2 deletions deployment/docker_compose/docker-compose.gpu-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,8 @@ services:


volumes:
cache_volume:
db_volume:
vespa_volume:
# Created by the container itself
model_cache_huggingface:
indexing_huggingface_model_cache:
indexing_huggingface_model_cache:
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,8 @@ services:


volumes:
cache_volume:
db_volume:
vespa_volume:
# Created by the container itself
model_cache_huggingface:
indexing_huggingface_model_cache:
indexing_huggingface_model_cache:
3 changes: 1 addition & 2 deletions deployment/docker_compose/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,8 @@ services:


volumes:
cache_volume:
db_volume:
vespa_volume:
# Created by the container itself
model_cache_huggingface:
indexing_huggingface_model_cache:
indexing_huggingface_model_cache:
3 changes: 1 addition & 2 deletions deployment/docker_compose/docker-compose.search-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ services:


volumes:
cache_volume:
db_volume:
driver: local
driver_opts:
Expand All @@ -227,4 +226,4 @@ volumes:
driver_opts:
type: none
o: bind
device: ${DANSWER_VESPA_DATA_DIR:-./vespa_data}
device: ${DANSWER_VESPA_DATA_DIR:-./vespa_data}
8 changes: 4 additions & 4 deletions deployment/helm/charts/danswer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ postgresql:
primary:
persistence:
size: 5Gi
enabled: false
enabled: true
auth:
existingSecret: danswer-secrets
secretKeys:
Expand Down Expand Up @@ -209,7 +209,7 @@ api:
autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 5
maxReplicas: 100
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80

Expand Down Expand Up @@ -269,7 +269,7 @@ background:
autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 5
maxReplicas: 100
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80

Expand Down Expand Up @@ -470,4 +470,4 @@ configMap:
WEB_DOMAIN: "http://localhost:3000" # for web server and api server
DOMAIN: "localhost" # for nginx
# Chat Configs
HARD_DELETE_CHATS: ""
HARD_DELETE_CHATS: ""
2 changes: 1 addition & 1 deletion deployment/kubernetes/redis-service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ spec:
"--requirepass", "$(REDIS_PASSWORD)",
"--save", "",
"--appendonly", "no"
]
]

0 comments on commit 39a8764

Please sign in to comment.