From 0e6fb6a129b282d239b700b977655caf4065ee11 Mon Sep 17 00:00:00 2001
From: Fauzan Elka <fauzan.elka@hotmail.com>
Date: Wed, 15 Dec 2021 15:16:34 +0700
Subject: [PATCH 1/3] Add ability to customize node port

---
 deploy/helm/wg-access-server/templates/service.yaml | 6 ++++++
 deploy/helm/wg-access-server/values.yaml            | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/deploy/helm/wg-access-server/templates/service.yaml b/deploy/helm/wg-access-server/templates/service.yaml
index 6734eab7..7f11acc7 100644
--- a/deploy/helm/wg-access-server/templates/service.yaml
+++ b/deploy/helm/wg-access-server/templates/service.yaml
@@ -19,6 +19,9 @@ spec:
 {{- end }}
   ports:
     - port: 80
+    {{- if eq .Values.web.service.type "NodePort" }}
+      nodePort: {{ .Values.web.service.port | default 32548 }}
+    {{- end }}
       targetPort: 8000
       protocol: TCP
       name: http
@@ -48,6 +51,9 @@ spec:
 {{- end }}
   ports:
     - port: 51820
+    {{- if eq .Values.wireguard.service.type "NodePort" }}
+      nodePort: {{ .Values.wireguard.service.port | default 30392 }}
+    {{- end }}
       targetPort: 51820
       protocol: UDP
       name: wireguard
diff --git a/deploy/helm/wg-access-server/values.yaml b/deploy/helm/wg-access-server/values.yaml
index e54f5cad..5f4de404 100644
--- a/deploy/helm/wg-access-server/values.yaml
+++ b/deploy/helm/wg-access-server/values.yaml
@@ -7,12 +7,16 @@ web:
     adminPassword: ""
   service:
     type: ClusterIP
+    # type: NodePort
+    # port: 32548
 
 wireguard:
   config:
     privateKey: ""
   service:
     type: ClusterIP
+    # type: NodePort
+    # port: 30392
 
 persistence:
   enabled: false

From 16c4986df8f35c7231fbfc386c9dd6f85b16bada Mon Sep 17 00:00:00 2001
From: Fauzan Elka <fauzan.elka@hotmail.com>
Date: Wed, 15 Dec 2021 15:27:37 +0700
Subject: [PATCH 2/3] Change default to random

---
 deploy/helm/wg-access-server/templates/service.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/helm/wg-access-server/templates/service.yaml b/deploy/helm/wg-access-server/templates/service.yaml
index 7f11acc7..4124ab77 100644
--- a/deploy/helm/wg-access-server/templates/service.yaml
+++ b/deploy/helm/wg-access-server/templates/service.yaml
@@ -19,8 +19,8 @@ spec:
 {{- end }}
   ports:
     - port: 80
-    {{- if eq .Values.web.service.type "NodePort" }}
-      nodePort: {{ .Values.web.service.port | default 32548 }}
+    {{- if and (eq .Values.web.service.type "NodePort") ( .Values.web.service.port ) }}
+      nodePort: {{ .Values.web.service.port }}
     {{- end }}
       targetPort: 8000
       protocol: TCP
@@ -51,8 +51,8 @@ spec:
 {{- end }}
   ports:
     - port: 51820
-    {{- if eq .Values.wireguard.service.type "NodePort" }}
-      nodePort: {{ .Values.wireguard.service.port | default 30392 }}
+    {{- if and (eq .Values.wireguard.service.type "NodePort") ( .Values.wireguard.service.port ) }}
+      nodePort: {{ .Values.wireguard.service.port }}
     {{- end }}
       targetPort: 51820
       protocol: UDP

From 6d40379658c6b20a50e7402b9a43c6091e992ebf Mon Sep 17 00:00:00 2001
From: Fauzan Elka <fauzan.elka@hotmail.com>
Date: Wed, 15 Dec 2021 15:27:46 +0700
Subject: [PATCH 3/3] Update helm docs

---
 deploy/helm/wg-access-server/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/helm/wg-access-server/README.md b/deploy/helm/wg-access-server/README.md
index 8f8d7860..d82d43f2 100644
--- a/deploy/helm/wg-access-server/README.md
+++ b/deploy/helm/wg-access-server/README.md
@@ -62,8 +62,10 @@ ingress:
 |-----|------|---------|-------------|
 | config | object | `{}` | inline wg-access-server config (config.yaml) |
 | web.service.type | string | `"ClusterIP"` |  |
+| web.service.port | number | random | Port number if `web.service.type` is set to `NodePort` |
 | wireguard.config.privateKey | string | "" | A wireguard private key. You can generate one using `$ wg genkey` |
 | wireguard.service.type | string | `"ClusterIP"` |  |
+| wireguard.service.port | number | random | Port number if `wireguard.service.type` is set to `NodePort` |
 | ingress.enabled | bool | `false` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |