From 0d8bb237d5cf708358b4fac4ac7f52c69a98dc3f Mon Sep 17 00:00:00 2001 From: irozet Date: Wed, 22 Jan 2020 00:16:35 +0300 Subject: [PATCH] [stable/openvpn] adding boolean property, which allows to skip default route (#20266) Signed-off-by: Irina Rozet --- stable/openvpn/Chart.yaml | 2 +- stable/openvpn/README.md | 3 ++- stable/openvpn/templates/config-openvpn.yaml | 2 ++ stable/openvpn/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml index 245e88e1cf..dc91f99e34 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: 4.0.0 +version: 4.1.0 appVersion: 1.1.0 maintainers: - name: jasongwartz diff --git a/stable/openvpn/README.md b/stable/openvpn/README.md index d821a7f0cb..c775390076 100644 --- a/stable/openvpn/README.md +++ b/stable/openvpn/README.md @@ -103,6 +103,7 @@ Parameter | Description | Default `openvpn.OVPN_K8S_POD_SUBNET` | Kubernetes pod network subnet (optional) | `255.0.0.0` `openvpn.OVPN_K8S_SVC_NETWORK` | Kubernetes service network (optional) | `nil` `openvpn.OVPN_K8S_SVC_SUBNET` | Kubernetes service network subnet (optional) | `nil` +`openvpn.DEFAULT_ROUTE_ENABLED` | Push a route which openvpn sets by default | `true` `openvpn.dhcpOptionDomain` | Push a `dhcp-option DOMAIN` config | `true` `openvpn.serverConf` | Lines appended to the end of the server configuration file (optional)| `nil` `openvpn.clientConf` | Lines appended into the client configuration file (optional) | `nil` @@ -191,4 +192,4 @@ openvpn: ### 3. Ubuntu Networking GUIs -Importing the client ovpn file from either of the Ubuntu network/connection management GUIs (Settings or Advanced Networking app) do not successfully import all settings. They seem to remove important parts of the configuration (DNS and Domains). The most reliable method of initiating the connection is to run `sudo openvpn --config `. \ No newline at end of file +Importing the client ovpn file from either of the Ubuntu network/connection management GUIs (Settings or Advanced Networking app) do not successfully import all settings. They seem to remove important parts of the configuration (DNS and Domains). The most reliable method of initiating the connection is to run `sudo openvpn --config `. diff --git a/stable/openvpn/templates/config-openvpn.yaml b/stable/openvpn/templates/config-openvpn.yaml index 2ae4ca35c4..e457def2d0 100644 --- a/stable/openvpn/templates/config-openvpn.yaml +++ b/stable/openvpn/templates/config-openvpn.yaml @@ -202,7 +202,9 @@ data: user nobody group nogroup +{{ if .Values.openvpn.DEFAULT_ROUTE_ENABLED }} push "route NETWORK NETMASK" +{{ end }} {{ if (.Values.openvpn.OVPN_K8S_POD_NETWORK) (.Values.openvpn.OVPN_K8S_POD_SUBNET) }} push "route {{ .Values.openvpn.OVPN_K8S_POD_NETWORK }} {{ .Values.openvpn.OVPN_K8S_POD_SUBNET }}" {{ end }} diff --git a/stable/openvpn/values.yaml b/stable/openvpn/values.yaml index 6d82b4827c..4ad03d0d25 100644 --- a/stable/openvpn/values.yaml +++ b/stable/openvpn/values.yaml @@ -83,6 +83,8 @@ openvpn: # OVPN_K8S_SVC_NETWORK: # Kubernetes service network subnet (optional). # OVPN_K8S_SVC_SUBNET: + # Set default route which openvpn figures basing on network routes inside openvpn pod + DEFAULT_ROUTE_ENABLED: true # Server certificate data # keystoreSecret: # secret with openvpn certificates. If specified, certificates are taken from the secret