From f58acd4e2a61ed0c7233a6a3e6e5c3609205ed79 Mon Sep 17 00:00:00 2001
From: rkuo-danswer <rkuo@danswer.ai>
Date: Fri, 13 Sep 2024 10:26:51 -0700
Subject: [PATCH] Add redis to helm chart (#2390)

---
 backend/danswer/document_index/vespa/index.py |  2 +-
 ct.yaml                                       |  2 +-
 deployment/helm/charts/danswer/Chart.lock     |  7 ++--
 deployment/helm/charts/danswer/Chart.yaml     |  4 +++
 .../charts/danswer/templates/configmap.yaml   |  1 +
 deployment/helm/charts/danswer/values.yaml    | 33 +++++++++++++++----
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/backend/danswer/document_index/vespa/index.py b/backend/danswer/document_index/vespa/index.py
index 0153f372f..c63f4b626 100644
--- a/backend/danswer/document_index/vespa/index.py
+++ b/backend/danswer/document_index/vespa/index.py
@@ -120,7 +120,7 @@ class VespaIndex(DocumentIndex):
         secondary_index_embedding_dim: int | None,
     ) -> None:
         deploy_url = f"{VESPA_APPLICATION_ENDPOINT}/tenant/default/prepareandactivate"
-        logger.debug(f"Sending Vespa zip to {deploy_url}")
+        logger.info(f"Deploying Vespa application package to {deploy_url}")
 
         vespa_schema_path = os.path.join(
             os.getcwd(), "danswer", "document_index", "vespa", "app_config"
diff --git a/ct.yaml b/ct.yaml
index 764af160d..14c557d8f 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -7,6 +7,6 @@ chart-repos:
   - vespa=https://unoplat.github.io/vespa-helm-charts
   - postgresql=https://charts.bitnami.com/bitnami
   
-helm-extra-args: --timeout 900s
+helm-extra-args: --timeout 600s
 
 validate-maintainers: false
diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock
index 918b44f6e..db7b18539 100644
--- a/deployment/helm/charts/danswer/Chart.lock
+++ b/deployment/helm/charts/danswer/Chart.lock
@@ -8,5 +8,8 @@ dependencies:
 - name: nginx
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 15.14.0
-digest: sha256:ab17b5d2c3883055cb4a26bf530043521be5220c24f804e954bb428273d16ba8
-generated: "2024-05-24T16:55:30.598279-07:00"
+- name: redis
+  repository: https://charts.bitnami.com/bitnami
+  version: 20.1.0
+digest: sha256:fb42426c1d13667a4929d0d6a7d681bf08120e4a4eb1d15437e4ec70920be3f8
+generated: "2024-09-11T09:16:03.312328-07:00"
diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml
index 96336911e..4205546c6 100644
--- a/deployment/helm/charts/danswer/Chart.yaml
+++ b/deployment/helm/charts/danswer/Chart.yaml
@@ -30,3 +30,7 @@ dependencies:
     version: 15.14.0
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: nginx.enabled
+  - name: redis
+    version: 20.1.0
+    repository: https://charts.bitnami.com/bitnami
+    condition: redis.enabled
diff --git a/deployment/helm/charts/danswer/templates/configmap.yaml b/deployment/helm/charts/danswer/templates/configmap.yaml
index 8119ae045..6236e1b62 100755
--- a/deployment/helm/charts/danswer/templates/configmap.yaml
+++ b/deployment/helm/charts/danswer/templates/configmap.yaml
@@ -8,6 +8,7 @@ data:
   INTERNAL_URL: "http://{{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}"
   POSTGRES_HOST: {{ .Release.Name }}-postgresql
   VESPA_HOST: "document-index-service"
+  REDIS_HOST: {{ .Release.Name }}-redis-master
   MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-inference-model-service"
   INDEXING_MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-indexing-model-service"
 {{- range $key, $value := .Values.configMap }}
diff --git a/deployment/helm/charts/danswer/values.yaml b/deployment/helm/charts/danswer/values.yaml
index 4318beef8..d3c0a4386 100644
--- a/deployment/helm/charts/danswer/values.yaml
+++ b/deployment/helm/charts/danswer/values.yaml
@@ -290,6 +290,7 @@ background:
   tolerations: []
 
 vespa:
+  enabled: true
   replicaCount: 1
   image:
     repository: vespa
@@ -300,7 +301,6 @@ vespa:
     app: vespa
     app.kubernetes.io/instance: danswer
     app.kubernetes.io/name: vespa
-  enabled: true
 
   podSecurityContext: {}
     # fsGroup: 2000
@@ -308,12 +308,6 @@ vespa:
   securityContext:
     privileged: true
     runAsUser: 0
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
 
   resources:
   # The Vespa Helm chart specifies default resources, which are quite modest. We override
@@ -330,6 +324,31 @@ vespa:
   affinity: {}
 
 
+redis:
+  enabled: true
+  architecture: standalone
+  commonConfiguration: |-
+    # Enable AOF https://redis.io/topics/persistence#append-only-file
+    appendonly no
+    # Disable RDB persistence, AOF persistence already enabled.
+    save ""
+  master:
+    replicaCount: 1
+    image:
+      registry: docker.io
+      repository: bitnami/redis
+      tag: "7.4.0"
+      pullPolicy: IfNotPresent
+    persistence:
+      enabled: false
+  service:
+    type: ClusterIP
+    port: 6379
+  auth:
+    existingSecret: danswer-secrets
+    existingSecretPasswordKey: redis_password
+
+
 # ingress:
 #  enabled: false
 #  className: ""