From efa329ecd446731e9cf6fab2287850b19658b48f Mon Sep 17 00:00:00 2001
From: MaverickD650 <92877124+MaverickD650@users.noreply.github.com>
Date: Sat, 3 Jun 2023 19:48:05 +0100
Subject: [PATCH] feat(invidious): fix username key (#9350)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
Used user key instead of username for pg user references. Doesn't break
anything but needs fixing.

⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/invidious/Chart.yaml            | 2 +-
 charts/stable/invidious/templates/_config.tpl | 4 ++--
 charts/stable/invidious/values.yaml           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/stable/invidious/Chart.yaml b/charts/stable/invidious/Chart.yaml
index b7eef8ec2c7..5ed075f9461 100644
--- a/charts/stable/invidious/Chart.yaml
+++ b/charts/stable/invidious/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/invidious
   - https://github.com/iv-org/invidious
   - https://docs.invidious.io/installation/#docker
-version: 5.0.1
+version: 5.0.2
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/invidious/templates/_config.tpl b/charts/stable/invidious/templates/_config.tpl
index 77632e1fe14..ff0cfc81719 100644
--- a/charts/stable/invidious/templates/_config.tpl
+++ b/charts/stable/invidious/templates/_config.tpl
@@ -23,8 +23,8 @@ data:
     db:
       user: {{ .Values.cnpg.main.user }}
       dbname: {{ .Values.cnpg.main.database }}
-      password: {{ .Values.cnpg.main.creds.password }}
-      host: {{ .Values.cnpg.main.creds.host }}
+      password: {{ .Values.cnpg.main.creds.password | trimAll "\"" }}
+      host: {{ .Values.cnpg.main.creds.host | trimAll "\"" }}
       port: 5432
 
     # Network
diff --git a/charts/stable/invidious/values.yaml b/charts/stable/invidious/values.yaml
index 7de64642c6e..70b4ed635fe 100644
--- a/charts/stable/invidious/values.yaml
+++ b/charts/stable/invidious/values.yaml
@@ -42,18 +42,18 @@ workload:
             - |
               echo "Starting DB Seed..."
               mkdir -p invidious && cd invidious
-  
+
               echo "Fetching seed files..."
               git init && \
               git remote add invidious https://github.com/iv-org/invidious.git && \
               git fetch invidious && \
               # Fetch config and docker dirs
               git checkout invidious/master -- docker config
-  
+
               # Move config into docker dir
               echo "Preparing directory structure..."
               mv -fv config docker
-  
+
               echo "Performing the seed..."
               cd docker
               ./init-invidious-db.sh
@@ -170,7 +170,7 @@ cnpg:
     database: invidious
     # DB User cannot be changed
     # hardcoded from upstream
-    username: kemal
+    user: kemal
 
 portal:
   open: