From 6cefa2e3d2b52c90c8e4510018887d738055ec3f Mon Sep 17 00:00:00 2001
From: perf3ct <jonfuller2012@gmail.com>
Date: Sat, 21 Oct 2023 12:43:56 -0700
Subject: [PATCH] this should be moved then

---
 templates/api.yaml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/templates/api.yaml b/templates/api.yaml
index 92f9785..2c30d63 100644
--- a/templates/api.yaml
+++ b/templates/api.yaml
@@ -38,18 +38,6 @@ probes:
   startup:
     enabled: false
 
-{{ if and .Values.frontend.ingress.enabled .Values.api.configMaps.config.enabled}}
-configMaps:
-  # The configuration for Vikunja's api.
-  # https://vikunja.io/docs/config-options/
-  config:
-    enabled: true
-    data:
-      config.yml:
-        service:
-          # Vikunja needs to know the frontend URL for password reset emails.
-          frontendUrl: "http://{{ index .Values.frontend.ingress.main.hosts 0 "host" }}{{ index .Values.frontend.ingress.main.hosts 0 "path" }}"
-{{ end }}
 
 env:
 {{ if .Values.redis.enabled }}
@@ -58,6 +46,11 @@ env:
 {{ if .Values.typesense.enabled }}
   VIKUNJA_TYPESENSE_ENABLED: "true"
 {{ end }}
+{{ if and .Values.frontend.ingress.enabled .Values.api.configMaps.config.enabled}}
+  # The configuration for Vikunja's api.
+  # https://vikunja.io/docs/config-options/
+  VIKUNJA_SERVICE_FRONTENDURL: "http://{{ index .Values.frontend.ingress.main.hosts 0 "host" }}{{ index .Values.frontend.ingress.main.hosts 0 "path" }}"
+{{ end }}
 
 # Logic to decide what the api URL should be
 {{ if .Values.frontend.ingress.enabled }}