From e3760ca4001d221d15e8c46c168f4a6b824b4fb9 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Wed, 16 Aug 2023 20:55:56 +0200
Subject: [PATCH] Migrate to the new openvpn setup

---
 .../values/values.istio-ingressgateway.yaml   |  4 ++++
 badhouseplants/values/values.openvpn.yaml     | 23 ++++++++++++++-----
 releases.yaml                                 |  4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/badhouseplants/values/values.istio-ingressgateway.yaml b/badhouseplants/values/values.istio-ingressgateway.yaml
index b20aa3d..60d5a2f 100644
--- a/badhouseplants/values/values.istio-ingressgateway.yaml
+++ b/badhouseplants/values/values.istio-ingressgateway.yaml
@@ -22,6 +22,10 @@ service:
       port: 1194
       protocol: TCP
       targetPort: 1194
+    - name: tcp
+      port: 25
+      protocol: TCP
+      targetPort: 25
     # -----------
     # -- Email
     # -----------
diff --git a/badhouseplants/values/values.openvpn.yaml b/badhouseplants/values/values.openvpn.yaml
index 67b743a..aae765e 100644
--- a/badhouseplants/values/values.openvpn.yaml
+++ b/badhouseplants/values/values.openvpn.yaml
@@ -13,17 +13,28 @@ istio:
       hostname: "*"
       service: openvpn
       port: 1194
-
+    - name: openvpn-tcp-fake-port
+      gateway: badhouseplants-vpn
+      kind: tcp
+      port_match: 25
+      hostname: "*"
+      service: openvpn
+      port: 1194
 storage:
   class: longhorn
   size: 512Mi
 
-image:
-  repository: lawtancool/docker-openvpn-xor
-  pullPolicy: IfNotPresent
-  tag: latest
 openvpn:
-  server: "tcp://195.201.250.50:1194"
+  proto: tcp
+  host: 195.201.250.50
+easyrsa:
+  cn: Bad Houseplants
+  country: Germany
+  province: NRW
+  city: Duesseldorf
+  org: Bad Houseplants
+  email: allanger@zohomail.com
+
 service:
   type: ClusterIP
   port: 1194
diff --git a/releases.yaml b/releases.yaml
index a3eb62e..602dc8f 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -183,8 +183,8 @@ templates:
   # ----------------------------
   openvpn: &openvpn
     name: openvpn
-    chart: allanger-charts/openvpn
-    version: 1.0.6
+    chart: allanger-gitea/openvpn
+    version: 1.0.3
     inherit:
       - template: default-env-values
       - template: ext-istio-resource