From 39a321c61d5c8ee490f2ff31ec09bdc0c23891fc Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:42:46 -0400
Subject: [PATCH] fix(wg-easy) make the services configurable in wg-easy
 (#10206)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
Update wg-easy services to be configurable so the confs will have the
correct ports.

⚒️ 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/stable/wg-easy/Chart.yaml  |  2 +-
 charts/stable/wg-easy/values.yaml | 47 +++++++++++++++++--------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/charts/stable/wg-easy/Chart.yaml b/charts/stable/wg-easy/Chart.yaml
index 39203f9f20f..90b6fd9faee 100644
--- a/charts/stable/wg-easy/Chart.yaml
+++ b/charts/stable/wg-easy/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/wg-easy
   - https://github.com/WeeJeWel/wg-easy
 type: application
-version: 4.0.15
+version: 4.0.16
 annotations:
   truecharts.org/catagories: |
     - networking
diff --git a/charts/stable/wg-easy/values.yaml b/charts/stable/wg-easy/values.yaml
index a04baeb6b05..e7521ddfc24 100644
--- a/charts/stable/wg-easy/values.yaml
+++ b/charts/stable/wg-easy/values.yaml
@@ -2,27 +2,7 @@ image:
   repository: tccr.io/truecharts/wg-easy
   pullPolicy: IfNotPresent
   tag: latest@sha256:5cc96ad86c87fb2ebc7dab65fc5b190ff0dcce370d0b9afa4aa4b5b2580a5000
-service:
-  main:
-    ports:
-      main:
-        targetPort: 51821
-        port: 51821
-  vpn:
-    enabled: true
-    ports:
-      vpn:
-        enabled: true
-        protocol: udp
-        port: 51820
-        targetPort: 51820
-persistence:
-  config:
-    enabled: true
-    mountPath: "/etc/wireguard"
-portal:
-  open:
-    enabled: true
+
 securityContext:
   container:
     PUID: 0
@@ -35,6 +15,20 @@ securityContext:
         - NET_ADMIN
         - NET_RAW
         - SYS_MODULE
+
+service:
+  main:
+    ports:
+      main:
+        port: 51821
+  vpn:
+    enabled: true
+    ports:
+      vpn:
+        enabled: true
+        protocol: udp
+        port: 51820
+
 workload:
   main:
     podSpec:
@@ -49,9 +43,20 @@ workload:
               type: tcp
           env:
             WG_HOST: "localhost"
+            PORT: "{{ .Values.service.main.ports.main.port }}"
+            WG_PORT: "{{ .Values.service.vpn.ports.vpn.port }}"
             WG_MTU: 1420
             WG_PERSISTENT_KEEPALIVE: 0
             WG_DEFAULT_ADDRESS: "10.8.0.x"
             WG_DEFAULT_DNS: "1.1.1.1"
             WG_ALLOWED_IPS: "0.0.0.0/0, ::/0"
             PASSWORD: "secretpass"
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/etc/wireguard"
+
+portal:
+  open:
+    enabled: true