From 6ff1d83cc796cf036e0499e125f9d856baf7bdd7 Mon Sep 17 00:00:00 2001 From: Alan Tang Date: Sat, 7 Dec 2019 20:47:09 +0000 Subject: [PATCH] [stable/openvpn] Add tolerations support for openvpn (#17693) * [stable/openvpn] Add tolerations support for openvpn Signed-off-by: Alan Tang * Bump a version Signed-off-by: Alan Tang --- stable/openvpn/Chart.yaml | 2 +- stable/openvpn/README.md | 1 + stable/openvpn/templates/openvpn-deployment.yaml | 4 ++++ stable/openvpn/values.yaml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml index 7e5eabbeb9..dff3f07b06 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.14.1 +version: 3.15.0 appVersion: 1.1.0 maintainers: - name: jasongwartz diff --git a/stable/openvpn/README.md b/stable/openvpn/README.md index 8ab25a3e31..5446016db4 100644 --- a/stable/openvpn/README.md +++ b/stable/openvpn/README.md @@ -113,6 +113,7 @@ Parameter | Description | Default `openvpn.istio.proxy.port` | Istio proxy port | `15001` `openvpn.iptablesExtra` | Custom iptables rules for clients | `[]` `nodeSelector` | Node labels for pod assignment | `{}` +`tolerations` | Tolerations for node taints | `[]` This chart has been engineered to use kube-dns and route all network traffic to kubernetes pods and services, to disable this behaviour set `openvpn.OVPN_K8S_POD_NETWORK` and `openvpn.OVPN_K8S_POD_SUBNET` to `null`. diff --git a/stable/openvpn/templates/openvpn-deployment.yaml b/stable/openvpn/templates/openvpn-deployment.yaml index 7b2c5afba8..a195c417e0 100644 --- a/stable/openvpn/templates/openvpn-deployment.yaml +++ b/stable/openvpn/templates/openvpn-deployment.yaml @@ -111,3 +111,7 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector }} {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/stable/openvpn/values.yaml b/stable/openvpn/values.yaml index bad963596a..406de915b1 100644 --- a/stable/openvpn/values.yaml +++ b/stable/openvpn/values.yaml @@ -110,3 +110,4 @@ openvpn: nodeSelector: {} +tolerations: []