From a4a055f78b2b4bfe698b2539a2e75ff58f779c5d Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Wed, 30 Aug 2023 23:07:28 -0400
Subject: [PATCH] fix(notifiarr): Attempt to fix mixed up values/q's (#12067)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

Questions was referring to non-existent values and not working so this
should fix things

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

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 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:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 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
- [ ] ⬆️ 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: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
---
 charts/incubator/notifiarr/Chart.yaml     | 2 +-
 charts/incubator/notifiarr/questions.yaml | 4 ++--
 charts/incubator/notifiarr/values.yaml    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/incubator/notifiarr/Chart.yaml b/charts/incubator/notifiarr/Chart.yaml
index d5a80d2b129..7371afde1a7 100644
--- a/charts/incubator/notifiarr/Chart.yaml
+++ b/charts/incubator/notifiarr/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/notifiarr
   - https://github.com/Notifiarr/notifiarr
 type: application
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - MediaApp-Other
diff --git a/charts/incubator/notifiarr/questions.yaml b/charts/incubator/notifiarr/questions.yaml
index b01e4d1135f..55c63ea10b1 100644
--- a/charts/incubator/notifiarr/questions.yaml
+++ b/charts/incubator/notifiarr/questions.yaml
@@ -10,14 +10,14 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
-                                - variable: env
+                                - variable: notifiarr
                                   group: App Configuration
                                   label: Image Environment
                                   schema:
                                     additional_attrs: true
                                     type: dict
                                     attrs:
-                                      - variable: DN_API_KEY
+                                      - variable: apikey
                                         label: Notifiarr All API Key
                                         description: Notifiarr All Integrations API key from https://notifiarr.com
                                         schema:
diff --git a/charts/incubator/notifiarr/values.yaml b/charts/incubator/notifiarr/values.yaml
index 4be32540aa4..436d06e65fc 100644
--- a/charts/incubator/notifiarr/values.yaml
+++ b/charts/incubator/notifiarr/values.yaml
@@ -4,6 +4,7 @@ image:
   tag: latest@sha256:913c71f5e325dd9af53c9e96f3d5d7d1b2d058a41f8253489320a4c69fbb0a44
 
 notifiarr:
+  apikey: "test"
   upstreams:
     - 172.16.0.0/16
   credentials:
@@ -24,7 +25,7 @@ workload:
         main:
           env:
             TMPDIR: /tmpdir
-            DN_API_KEY: "test"
+            DN_API_KEY: '{{ .Values.notifiarr.apikey }}'
             DN_BIND_ADDR: '{{ printf "0.0.0.0:%v" .Values.service.main.ports.main.port }}'
             DN_UPSTREAMS_0: '{{ join " " .Values.notifiarr.upstreams }}'
             DN_UI_PASSWORD: '{{ printf "%v:%v" .Values.notifiarr.credentials.username .Values.notifiarr.credentials.password }}'