Skip to content

Commit 8f4e75d

Browse files
committed
Don't double quote env vars
1 parent 42ad3dd commit 8f4e75d

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

applications/wg-easy/charts/wg-easy/values.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ wireguard:
77
# See https://github.com/WeeJeWel/wg-easy for configuration options
88
host: "example.com"
99
port: 51820 # This is used in the postUp
10-
defaultAddress: "10.10.10.x"
11-
defaultDns: "1.1.1.1"
12-
allowedIps: "0.0.0.0/5, 8.0.0.0/7, 11.0.0.0/8, 12.0.0.0/6, 16.0.0.0/4, 32.0.0.0/3, 64.0.0.0/2, 128.0.0.0/3, 160.0.0.0/5, 168.0.0.0/6, 172.0.0.0/12, 172.32.0.0/11, 172.64.0.0/10, 172.128.0.0/9, 173.0.0.0/8, 174.0.0.0/7, 176.0.0.0/4, 192.0.0.0/9, 192.128.0.0/11, 192.160.0.0/13, 192.169.0.0/16, 192.170.0.0/15, 192.172.0.0/14, 192.176.0.0/12, 192.192.0.0/10, 193.0.0.0/8, 194.0.0.0/7, 196.0.0.0/6, 200.0.0.0/5, 208.0.0.0/4, 224.0.0.0/3"
13-
postUp: "iptables -A FORWARD -i wg0 -o eth0 -d 192.168.0.0/16,172.16.0.0/12,10.0.0.0/8 -j DROP; iptables -t nat -A POSTROUTING -s 10.10.10.0/24 -o eth0 -j MASQUERADE; iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT"
10+
defaultAddress: 10.10.10.x
11+
defaultDns: 1.1.1.1
12+
allowedIps: 0.0.0.0/5, 8.0.0.0/7, 11.0.0.0/8, 12.0.0.0/6, 16.0.0.0/4, 32.0.0.0/3, 64.0.0.0/2, 128.0.0.0/3, 160.0.0.0/5, 168.0.0.0/6, 172.0.0.0/12, 172.32.0.0/11, 172.64.0.0/10, 172.128.0.0/9, 173.0.0.0/8, 174.0.0.0/7, 176.0.0.0/4, 192.0.0.0/9, 192.128.0.0/11, 192.160.0.0/13, 192.169.0.0/16, 192.170.0.0/15, 192.172.0.0/14, 192.176.0.0/12, 192.192.0.0/10, 193.0.0.0/8, 194.0.0.0/7, 196.0.0.0/6, 200.0.0.0/5, 208.0.0.0/4, 224.0.0.0/3
13+
postUp: iptables -A FORWARD -i wg0 -o eth0 -d 192.168.0.0/16,172.16.0.0/12,10.0.0.0/8 -j DROP; iptables -t nat -A POSTROUTING -s 10.10.10.0/24 -o eth0 -j MASQUERADE; iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT
1414

1515
# Shared templates for Traefik routes
1616
templates:
@@ -26,7 +26,10 @@ templates:
2626

2727
controllers:
2828
main:
29+
serviceAccount:
30+
name: default
2931
pod:
32+
enableServiceLinks: true
3033
securityContext:
3134
sysctls:
3235
- name: net.ipv4.ip_forward
@@ -37,16 +40,16 @@ controllers:
3740
# Host is required, no default makes sense
3841
WG_HOST: '{{ required "external host name is required. Set wireguard.host" .Values.wireguard.host }}'
3942
# Use dig with sensible defaults for all other parameters
40-
WG_PORT: '{{ dig "wireguard" "port" "" .Values | quote }}'
41-
WG_MTU: '{{ dig "wireguard" "mtu" "" .Values | quote }}'
42-
WG_PERSISTENT_KEEPALIVE: '{{ dig "wireguard" "persistentKeepalive" "" .Values | quote }}'
43-
WG_DEFAULT_ADDRESS: '{{ dig "wireguard" "defaultAddress" "" .Values | quote }}'
44-
WG_DEFAULT_DNS: '{{ dig "wireguard" "defaultDns" "" .Values | quote }}'
45-
WG_ALLOWED_IPS: '{{ dig "wireguard" "allowedIps" "" .Values | quote }}'
46-
WG_PRE_UP: '{{ dig "wireguard" "preUp" "" .Values | quote }}'
47-
WG_POST_UP: '{{ dig "wireguard" "postUp" "" .Values | quote }}'
48-
WG_PRE_DOWN: '{{ dig "wireguard" "preDown" "" .Values | quote }}'
49-
WG_POST_DOWN: '{{ dig "wireguard" "postDown" "" .Values | quote }}'
43+
WG_PORT: '{{ dig "wireguard" "port" "" .Values }}'
44+
WG_MTU: '{{ dig "wireguard" "mtu" "" .Values}}'
45+
WG_PERSISTENT_KEEPALIVE: '{{ dig "wireguard" "persistentKeepalive" "" .Values }}'
46+
WG_DEFAULT_ADDRESS: '{{ dig "wireguard" "defaultAddress" "" .Values }}'
47+
WG_DEFAULT_DNS: '{{ dig "wireguard" "defaultDns" "" .Values }}'
48+
WG_ALLOWED_IPS: '{{ dig "wireguard" "allowedIps" "" .Values }}'
49+
WG_PRE_UP: '{{ dig "wireguard" "preUp" "" .Values }}'
50+
WG_POST_UP: '{{ dig "wireguard" "postUp" "" .Values }}'
51+
WG_PRE_DOWN: '{{ dig "wireguard" "preDown" "" .Values }}'
52+
WG_POST_DOWN: '{{ dig "wireguard" "postDown" "" .Values }}'
5053
envFrom:
5154
- secretRef:
5255
identifier: webpass
@@ -63,9 +66,6 @@ controllers:
6366
requests:
6467
cpu: 50m
6568
memory: 50Mi
66-
limits:
67-
cpu: 100m
68-
memory: 100Mi
6969
securityContext:
7070
allowPrivilegeEscalation: false
7171
capabilities:
@@ -108,7 +108,7 @@ service:
108108
vpn:
109109
controller: main
110110
enabled: true
111-
type: LoadBalancer
111+
type: NodePort
112112
ipFamilyPolicy: SingleStack
113113
ipFamilies:
114114
- IPv4

0 commit comments

Comments
 (0)