From e1faf5f247385d138a2904e074462d74e3f6ec86 Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:37:07 -0400
Subject: [PATCH] fix(kopia) fix kopia arg to specify the main port. (#10320)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
Fix kopia arg to specify the correct port instead of a static one.

⚒️ 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._
---
 charts/incubator/kopia/Chart.yaml     |  2 +-
 charts/incubator/kopia/questions.yaml |  7 ++++---
 charts/incubator/kopia/values.yaml    | 26 ++++++++++++--------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/charts/incubator/kopia/Chart.yaml b/charts/incubator/kopia/Chart.yaml
index 203fb215f05..b66568c47e6 100644
--- a/charts/incubator/kopia/Chart.yaml
+++ b/charts/incubator/kopia/Chart.yaml
@@ -19,7 +19,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/kopia
   - https://kopia.io/docs/installation/#docker-images
   - https://github.com/kopia/kopia
-version: 6.0.3
+version: 6.0.4
 annotations:
   truecharts.org/catagories: |
     - utility
diff --git a/charts/incubator/kopia/questions.yaml b/charts/incubator/kopia/questions.yaml
index 3c6168ae978..ec62aac2dc7 100644
--- a/charts/incubator/kopia/questions.yaml
+++ b/charts/incubator/kopia/questions.yaml
@@ -26,7 +26,7 @@ questions:
                                           default: "secret"
                                           required: true
                                       - variable: KOPIA_PASSWORD
-                                        label: "KOPIA_PASSWORD"
+                                        label: "Kopia Password"
                                         description: "Repository password"
                                         schema:
                                           type: string
@@ -34,20 +34,21 @@ questions:
                                           required: true
                                           private: true
                                       - variable: KOPIA_SERVER_USERNAME
-                                        label: "KOPIA_SERVER_USERNAME"
+                                        label: "Kopia Server Username"
                                         description: "Username for WebUI"
                                         schema:
                                           type: string
                                           default: "server_user"
                                           required: true
                                       - variable: KOPIA_SERVER_PASSWORD
-                                        label: "KOPIA_SERVER_PASSWORD"
+                                        label: "Kopia Server Password"
                                         description: "Password for WebUI"
                                         schema:
                                           type: string
                                           default: "server_password"
                                           required: true
                                           private: true
+
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
diff --git a/charts/incubator/kopia/values.yaml b/charts/incubator/kopia/values.yaml
index 367e571c905..88ee2af9fd8 100644
--- a/charts/incubator/kopia/values.yaml
+++ b/charts/incubator/kopia/values.yaml
@@ -3,7 +3,18 @@ image:
   tag: 0.13.0@sha256:72ed1856efdd443be31e23535d24242056639a387587aa3ade5413e75dad0603
   pullPolicy: IfNotPresent
 
+service:
+  main:
+    ports:
+      main:
+        protocol: http
+        port: 10238
 
+kopia:
+  kopia_user: "user"
+  kopia_password: "secret"
+  kopia_server_username: "user"
+  kopia_server_password: "password"
 
 workload:
   main:
@@ -16,7 +27,7 @@ workload:
           args:
             - server
             - start
-            - --address=http://0.0.0.0:10238
+            - --address=http://0.0.0.0:{{ .Values.service.main.ports.main.port }}
             - --insecure
             - --server-username={{ .Values.kopia.server_username }}
             - --server-password={{ .Values.kopia.server_password }}
@@ -28,19 +39,6 @@ workload:
             startup:
               enabled: false
 
-kopia:
-  kopia_user: "user"
-  kopia_password: "secret"
-  kopia_server_username: "user"
-  kopia_server_password: "password"
-
-service:
-  main:
-    ports:
-      main:
-        protocol: http
-        port: 10238
-
 persistence:
   config:
     enabled: true