From f45e1eca707df997abd1a4a1479f75e7193295fc Mon Sep 17 00:00:00 2001
From: perf3ct <jonfuller2012@gmail.com>
Date: Thu, 28 Sep 2023 18:55:27 -0700
Subject: [PATCH] cool

---
 Chart.yaml             |  6 +++---
 templates/backend.yaml |  8 ++++++++
 values.yaml            | 15 +--------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index 0ada135..61329e1 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -15,13 +15,13 @@ appVersion: 0.21.0
 kubeVersion: ">= 1.19"
 dependencies:
 - name: redis
-  version: 17.5.1
   repository: https://charts.bitnami.com/bitnami
-  condition: redisEnabled
+  version: 17.11.6
+  condition: redis.enabled
 - name: postgresql
   version: 12.1.9
   repository: https://charts.bitnami.com/bitnami
-  condition: postgresqlEnabled
+  condition: postgresql.enabled
 - name: common
   repository: https://bjw-s.github.io/helm-charts
   version: 1.5.1
diff --git a/templates/backend.yaml b/templates/backend.yaml
index b867173..2fd9d54 100644
--- a/templates/backend.yaml
+++ b/templates/backend.yaml
@@ -14,6 +14,14 @@ service:
         port: 3456
         protocol: HTTP
 
+env:
+  {{ if .Values.typesense.enabled }}
+  VIKUNJA_TYPESENSE_ENABLED: {{ .Values.typesense.apiKey }}
+  VIKUNJA_TYPESENSE_URL: {{ .Values.typesense.host }}
+  VIKUNJA_TYPESENSE_APIKEY: {{ .Values.typesense.apiKey }}
+  {{ end }}
+
+
 
 {{ end }}
 
diff --git a/values.yaml b/values.yaml
index 57aca01..80d589c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -4,19 +4,6 @@
 
 # These entries are shared between all the vikunja components
 
-env:
-  REDIS_HOSTNAME: '{{ printf "%s-redis-master" .Release.Name }}'
-  DB_HOSTNAME: "{{ .Release.Name }}-postgresql"
-  DB_USERNAME: "{{ .Values.postgresql.global.postgresql.auth.username }}"
-  DB_DATABASE_NAME: "{{ .Values.postgresql.global.postgresql.auth.database }}"
-  # -- You should provide your own secret outside of this helm-chart and use `postgresql.global.postgresql.auth.existingSecret` to provide credentials to the postgresql instance
-  DB_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
-  TYPESENSE_ENABLED: "{{ .Values.typesense.enabled }}"
-  TYPESENSE_API_KEY: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
-  TYPESENSE_HOST: '{{ printf "%s-typesense" .Release.Name }}'
-  VIKUNJA_FRONTEND_URL: '{{ printf "http://%s-web:3000" .Release.Name }}'
-  VIKUNJA_API_URL: '{{ printf "http://%s-server:3001" .Release.Name }}'
-
 image:
   tag: 0.21.0
 
@@ -46,7 +33,7 @@ frontend:
       tls: []
 
 backend:
-  enabled: false
+  enabled: true
   image:
     repository: vikunja/api
     pullPolicy: IfNotPresent