From a1c210bb8b38cc0d71e8b75b867d5627ca4fead6 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 6 Feb 2024 12:01:59 +0200
Subject: [PATCH] invidious - fix db name and cleanup init logs (#2131)

* invidious - fix db name and cleanup init logs

* bump major to skip running upgrade task
---
 library/ix-dev/community/invidious/Chart.yaml  |  2 +-
 .../invidious/templates/_configuration.tpl     | 18 +++++++++---------
 .../community/invidious/templates/common.yaml  |  8 --------
 library/ix-dev/community/invidious/values.yaml |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/library/ix-dev/community/invidious/Chart.yaml b/library/ix-dev/community/invidious/Chart.yaml
index 8697247aca..301742d182 100644
--- a/library/ix-dev/community/invidious/Chart.yaml
+++ b/library/ix-dev/community/invidious/Chart.yaml
@@ -3,7 +3,7 @@ description: Invidious is an alternative front-end to YouTube
 annotations:
   title: Invidious
 type: application
-version: 1.0.3
+version: 2.0.0
 apiVersion: v2
 appVersion: latest
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/invidious/templates/_configuration.tpl b/library/ix-dev/community/invidious/templates/_configuration.tpl
index 4aafa282d6..558f6f041f 100644
--- a/library/ix-dev/community/invidious/templates/_configuration.tpl
+++ b/library/ix-dev/community/invidious/templates/_configuration.tpl
@@ -4,7 +4,7 @@
 
   {{- $dbHost := (printf "%s-postgres" $fullname) -}}
   {{- $dbUser := "kemal" -}} {{/* User is hardcoded */}}
-  {{- $dbName := "invidious" -}}
+  {{- $dbName := "kemal" -}} {{/* Database is hardcoded */}}
 
   {{- $dbPass := (randAlphaNum 32) -}}
   {{- with (lookup "v1" "Secret" .Release.Namespace (printf "%s-postgres-creds" $fullname)) -}}
@@ -40,11 +40,11 @@ secret:
   {{- $configOpts := list
     (dict "path" "check_tables" "value" "true")
     (dict "path" "database_url" "value" ($dbURL | quote))
-    (dict "path" "database.user" "value" ($dbUser | quote))
-    (dict "path" "database.password" "value" ($dbPass | quote))
-    (dict "path" "database.dbname" "value" ($dbName | quote))
-    (dict "path" "database.host" "value" ($dbHost | quote))
-    (dict "path" "database.port" "value" "5432")
+    (dict "path" "db.user" "value" ($dbUser | quote))
+    (dict "path" "db.password" "value" ($dbPass | quote))
+    (dict "path" "db.dbname" "value" ($dbName | quote))
+    (dict "path" "db.host" "value" ($dbHost | quote))
+    (dict "path" "db.port" "value" "5432")
     (dict "path" "hmac_key" "value" ($hmacKey | quote))
     (dict "path" "host_binding" "value" ("0.0.0.0" | quote))
     (dict "path" "port" "value" .Values.invidiousNetwork.webPort)
@@ -63,9 +63,9 @@ secret:
         config="/config/config.yaml"
         echo "Updating Invidious Config..."
         {{- range $item := $configOpts }}
-        echo "Updating {{ $item.path }} to {{ $item.value }}"
+        echo "Updating [{{ $item.path }}]"
         yq -i '.{{ $item.path }} = {{ $item.value }}' "$config"
+        echo "Updated [{{ $item.path }}] to $(yq '.{{ $item.path }}' "$config")"
         {{- end }}
-        cat "$config"
-        echo "Config already exists, skipping."
+        echo "Config updated!"
 {{- end -}}
diff --git a/library/ix-dev/community/invidious/templates/common.yaml b/library/ix-dev/community/invidious/templates/common.yaml
index dd0c192ab6..730f7da691 100644
--- a/library/ix-dev/community/invidious/templates/common.yaml
+++ b/library/ix-dev/community/invidious/templates/common.yaml
@@ -1,13 +1,5 @@
 {{- include "ix.v1.common.loader.init" . -}}
 
-{{- if not .Values.yqImage -}}
-  {{- $_ := set .Values "yqImage" (dict
-    "repository" "mikefarah/yq"
-    "tag" "4.40.5"
-    "pullPolicy" "IfNotPresent"
-  ) -}}
-{{- end -}}
-
 {{/* Merge the templates with Values */}}
 {{- $_ := mustMergeOverwrite .Values (include "invidious.configuration" $ | fromYaml) -}}
 {{- $_ := mustMergeOverwrite .Values (include "invidious.service" $ | fromYaml) -}}
diff --git a/library/ix-dev/community/invidious/values.yaml b/library/ix-dev/community/invidious/values.yaml
index 2bca72e004..72669dfb02 100644
--- a/library/ix-dev/community/invidious/values.yaml
+++ b/library/ix-dev/community/invidious/values.yaml
@@ -49,7 +49,7 @@ notes:
     <details>
       <summary>Database Details</summary>
 
-      - Database: `invidious`
+      - Database: `kemal`
       - Username: `kemal`
       - Password: `{{ .Values.invidiousDbPass }}`
       - Host:     `{{ .Values.invidiousDbHost }}.{{ .Release.Namespace }}.svc.cluster.local`