From d41945f05da536f20e5ca2d5cf1262ecaf7c2298 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Wed, 18 Dec 2024 21:57:49 +0100
Subject: [PATCH] Persist external service config for XRAY

---
 .../applications/helmfile-etersoft.yaml       | 12 +++-------
 .../external-service-xray/service.yaml        | 23 +++++++++++++++++++
 values/etersoft/values.traefik.yaml           |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 kustomizations/external-service-xray/service.yaml

diff --git a/installations/applications/helmfile-etersoft.yaml b/installations/applications/helmfile-etersoft.yaml
index 91996a1..08c07f1 100644
--- a/installations/applications/helmfile-etersoft.yaml
+++ b/installations/applications/helmfile-etersoft.yaml
@@ -47,14 +47,8 @@ releases:
     inherit:
       - template: default-env-values
       - template: default-env-secrets
-  - name: server-xray-public-bridge
-    chart: allangers-charts/server-xray
+
+  - name: external-service-xray
+    chart: ../../kustomizations/external-service-xray
     installed: true
     namespace: public-xray
-    version: 0.4.0
-    inherit:
-      - template: default-env-secrets
-      - template: default-env-values
-      - template: ext-tcp-routes
-      - template: ext-cilium
-      - template: ext-certificate
diff --git a/kustomizations/external-service-xray/service.yaml b/kustomizations/external-service-xray/service.yaml
new file mode 100644
index 0000000..d1183d8
--- /dev/null
+++ b/kustomizations/external-service-xray/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: xray-external-proxy
+spec:
+  externalName: xray-public.badhouseplants.net
+  sessionAffinity: None
+  type: ExternalName
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRouteTCP
+metadata:
+  name: xray-external-proxy
+spec:
+  entryPoints:
+    - xray-public
+  routes:
+    - match: HostSNI(`*`)
+      services:
+        - name: xray-external-proxy
+          nativeLB: true
+          port: 27015
+
diff --git a/values/etersoft/values.traefik.yaml b/values/etersoft/values.traefik.yaml
index efe45a7..7ec3b1c 100644
--- a/values/etersoft/values.traefik.yaml
+++ b/values/etersoft/values.traefik.yaml
@@ -5,7 +5,7 @@ ports:
       default: true
     exposedPort: 1194
     protocol: TCP
-  xray:
+  xray-public:
     port: 27015
     expose:
       default: true