From 9cf615cbcbafcbbe4fdbb7adba78b3b9005f8872 Mon Sep 17 00:00:00 2001
From: Luke Addison <luke.addison@jetstack.io>
Date: Tue, 16 Jul 2019 22:32:07 +0100
Subject: [PATCH] [stable/openvpn] Add readiness probe (#15580)

* Add OpenVPN readiness probe

Signed-off-by: Luke Addison <luke.addison@jetstack.io>

* Use internal port

Signed-off-by: Luke Addison <luke.addison@jetstack.io>

* Bump chart version

Signed-off-by: Luke Addison <luke.addison@jetstack.io>
---
 stable/openvpn/Chart.yaml                        |  2 +-
 stable/openvpn/templates/openvpn-deployment.yaml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml
index a8c4b74781..b30ac741a5 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.13.2
+version: 3.13.3
 appVersion: 1.1.0
 maintainers:
 - name: jfelten
diff --git a/stable/openvpn/templates/openvpn-deployment.yaml b/stable/openvpn/templates/openvpn-deployment.yaml
index 123b98e6f7..fa83634891 100644
--- a/stable/openvpn/templates/openvpn-deployment.yaml
+++ b/stable/openvpn/templates/openvpn-deployment.yaml
@@ -40,6 +40,19 @@ spec:
           capabilities:
             add:
               - NET_ADMIN
+        readinessProbe:
+          initialDelaySeconds: 5
+          periodSeconds: 5
+          successThreshold: 2
+          exec:
+            command:
+            - nc
+        {{- if eq .Values.openvpn.OVPN_PROTO "udp" }}
+            - -u
+        {{- end }}
+            - -z
+            - 127.0.0.1
+            - "{{ .Values.service.internalPort }}"
         resources:
           requests:
             cpu: "{{ .Values.resources.requests.cpu }}"