From 5cef3e39fd3cf0c3e97d57aeb0e165df4dc54929 Mon Sep 17 00:00:00 2001 From: Dan Wendorf Date: Wed, 9 May 2018 15:38:53 -0700 Subject: [PATCH] [stable/openvpn] Add option to remove `dhcp-option DOMAIN` (#5404) * [stable/openvpn] Add option to remove `dhcp-option DOMAIN` Not all VPN clients support this option, so having the option to remove it can prevent errors on client connections. * Update Chart.yaml --- stable/openvpn/Chart.yaml | 2 +- stable/openvpn/README.md | 1 + stable/openvpn/templates/config-openvpn.yaml | 2 ++ stable/openvpn/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml index 39c5bd9fb9..b47bba7ac7 100755 --- a/stable/openvpn/Chart.yaml +++ b/stable/openvpn/Chart.yaml @@ -3,7 +3,7 @@ description: A Helm chart to install an openvpn server inside a kubernetes clust generation is also part of the deployment, and this chart will generate client keys as needed. name: openvpn -version: 3.1.0 +version: 3.2.0 appVersion: 1.1.0 maintainers: - name: jfelten diff --git a/stable/openvpn/README.md b/stable/openvpn/README.md index 4276aa18bf..17616dc410 100644 --- a/stable/openvpn/README.md +++ b/stable/openvpn/README.md @@ -60,6 +60,7 @@ New certificates are generated with each deployment. If persistence is enabled * openvpn.OVPN_PROTO: tcp - Protocol used by openvpn tcp or udp (default: tcp). * openvpn.OVPN_K8S_POD_NETWORK: "10.0.0.0" - Kubernetes pod network (optional). * openvpn.OVPN_K8S_POD_SUBNET: "255.0.0.0" - Kubernetes pod network subnet (optional). +* openvpn.dhcpOptionDomain: true - Push a `dhcp-option DOMAIN` config * openvpn.conf: "" - Arbitrary lines appended to the end of the server configuration file #### Note: As configured the chart will create a route for a large 10.0.0.0/8 network that may cause issues if that is your local network. If so tweak this value to something more restrictive. This route is added, because GKE generates pods with IPs in this range. diff --git a/stable/openvpn/templates/config-openvpn.yaml b/stable/openvpn/templates/config-openvpn.yaml index c626366b39..78a0d33869 100644 --- a/stable/openvpn/templates/config-openvpn.yaml +++ b/stable/openvpn/templates/config-openvpn.yaml @@ -105,7 +105,9 @@ data: push "route {{ .Values.openvpn.OVPN_K8S_POD_NETWORK }} {{ .Values.openvpn.OVPN_K8S_POD_SUBNET }}" {{ end }} +{{ if .Values.openvpn.dhcpOptionDomain }} push "dhcp-option DOMAIN OVPN_K8S_SEARCH" +{{ end }} push "dhcp-option DNS OVPN_K8S_DNS" {{- if .Values.openvpn.conf }} diff --git a/stable/openvpn/values.yaml b/stable/openvpn/values.yaml index af4d4b55b5..f2cc95c962 100644 --- a/stable/openvpn/values.yaml +++ b/stable/openvpn/values.yaml @@ -48,6 +48,8 @@ openvpn: OVPN_K8S_POD_NETWORK: "10.0.0.0" # Kubernetes pod network subnet (optional). OVPN_K8S_POD_SUBNET: "255.0.0.0" + # Push a `dhcp-option DOMAIN` config + dhcpOptionDomain: true # Arbitrary lines appended to the end of the server configuration file # conf: | # max-clients 100