Merge pull request #11 from bryopsida/cidr-changes

Splits the serverCidr value into serverCidr and serverAddress
bryopsida · Dec 11, 2022 · b3034ec · b3034ec
2 parents 130a278 + 4ddb474
commit b3034ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/helm/wireguard/Chart.yaml b/helm/wireguard/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: wireguard
 description: A Helm chart for managing a wireguard vpn in kubernetes
 type: application
-version: 0.6.0
+version: 0.7.0
 appVersion: "0.0.0"
 maintainers:
   - name: bryopsida
diff --git a/helm/wireguard/README.md b/helm/wireguard/README.md
@@ -1,6 +1,6 @@
 # wireguard
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
 
 A Helm chart for managing a wireguard vpn in kubernetes
 
@@ -36,7 +36,8 @@ A Helm chart for managing a wireguard vpn in kubernetes
 | service.port | int | `51280` | Service port, default is 51280 UDP |
 | service.type | string | `"LoadBalancer"` | Service type, to keep internal to cluster use ClusterIP |
 | wireguard.clients | list | `[]` | A collection of clients that will be added to wg0.conf, accepts objects with keys PublicKey and AllowedIPs, stored in secret |
-| wireguard.serverCidr | string | `"10.34.0.1/24"` |  |
+| wireguard.serverAddress | string | `"10.34.0.1/24"` | Address of the VPN server |
+| wireguard.serverCidr | string | `"10.34.0.0/24"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/helm/wireguard/templates/config.yaml b/helm/wireguard/templates/config.yaml
@@ -1,6 +1,6 @@
 {{- define "wg-config-template" -}}
 [Interface]
-Address = {{ .Values.wireguard.serverCidr }}
+Address = {{ .Values.wireguard.serverAddress }}
 ListenPort = 51820
 PostUp = wg set wg0 private-key /etc/wireguard/privatekey && iptables -t nat -A POSTROUTING -s {{ .Values.wireguard.serverCidr }} -o eth0 -j MASQUERADE
 PostDown = iptables -t nat -D POSTROUTING -s {{ .Values.wireguard.serverCidr }} -o eth0 -j MASQUERADE

diff --git a/helm/wireguard/values.yaml b/helm/wireguard/values.yaml
@@ -3,8 +3,10 @@ image:
   tag: main
   pullPolicy: Always
 wireguard:
+  # -- Address of the VPN server
+  serverAddress: 10.34.0.1/24
   #  -- Subnet for your VPN, take care not to clash with cluster POD cidr
-  serverCidr: 10.34.0.1/24
+  serverCidr: 10.34.0.0/24
   # -- A collection of clients that will be added to wg0.conf, accepts objects with keys PublicKey and AllowedIPs, stored in secret
   clients: []
 service: