New ports for xray

installations/applications/helmfile-badhouseplants.yaml

@@ -49,14 +49,14 @@ releases:
       - template: env-values
       - template: env-secrets
 
-  - name: vaultwarden
-    chart: allangers-charts/vaultwarden
-    version: 2.3.0
-    namespace: applications
-    inherit:
-      - template: default-env-values
-      - template: default-env-secrets
-      - template: ext-database
+        #- name: vaultwarden
+        #  chart: allangers-charts/vaultwarden
+        #  version: 2.3.0
+        #  namespace: applications
+        #  inherit:
+        #    - template: default-env-values
+        #    - template: default-env-secrets
+        #    - template: ext-database
 
   - name: stalwart
     chart: allangers-charts/stalwart

values/badhouseplants/org-badhouseplants/app-linkstack/values.yaml

@@ -0,0 +1,15 @@
+shortcuts:
+  hostname: links.badhouseplants.net
+  adminEmail: allanger@badhouseplants.net
+
+ingress:
+  main:
+    class: traefik
+    metadata:
+      annotations:
+        kubernetes.io/ingress.class: traefik
+        traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+        kubernetes.io/tls-acme: "true"
+        kubernetes.io/ingress.allow-http: "false"
+        kubernetes.io/ingress.global-static-ip-name: ""
+        cert-manager.io/cluster-issuer: badhouseplants-issuer-http01

values/badhouseplants/values.server-xray-public-edge.yaml

@@ -9,6 +9,13 @@ certificate:
       dnsNames:
         - xray-public-edge.badhouseplants.net
         - 195.201.249.91
+workload:
+  replicas: 1
+  containers:
+    server-xray:
+      ports:
+        shadowsocks-tcp: tcp
+        shadowsocks-udp: udp
 
 traefik:
   enabled: true
@@ -18,6 +25,17 @@ traefik:
       match: HostSNI(`*`)
       entrypoint: xray-edge
       port: 443
+    - name: server-shadowsocks-public-edge-tcp
+      service: server-xray-public-edge-shadowsocks-tcp
+      match: HostSNI(`*`)
+      entrypoint: ssocks-etcp
+      port: 8443
+  udpRoutes:
+    - name: server-shadowsocks-public-edge-udp
+      service: server-xray-public-edge-shadowsocks-udp
+      match: HostSNI(`*`)
+      entrypoint: ssocks-eudp
+      port: 8443
 shortcuts:
   hostname: xray-public-edge.badhouseplants.net
 ingress:
@@ -33,8 +51,23 @@ extraVolumes:
   certs:
     secret:
       secretName: xray-public-edge.badhouseplants.net
-workload:
-  replicas: 1
+service:
+  shadowsocks-tcp:
+    enabled: true
+    type: ClusterIP
+    ports:
+      tcp:
+        port: 8443
+        targetPort: 8443
+        protocol: TCP
+  shadowsocks-udp:
+    enabled: true
+    type: ClusterIP
+    ports:
+      udp:
+        port: 8443
+        targetPort: 8443
+        protocol: UDP
 ext-cilium:
   enabled: true
   ciliumNetworkPolicies:

values/badhouseplants/values.team-fortress-2.yaml

@@ -17,7 +17,7 @@ traefik:
   enabled: true
   tcpRoutes:
     - name: team-fortress-2
-      service: team-fortress-2-rcon
+      service: team-fortress-2-tf2-rcon
       match: HostSNI(`*`)
       entrypoint: tf2-rcon
       port: 27015
@@ -25,7 +25,7 @@ traefik:
     - name: team-fortress-2
       service: team-fortress-2-tf2
       match: HostSNI(`*`)
-      entrypoint: tf2
+      entrypoint: tf2-main
       port: 27015
 
 storage:

values/badhouseplants/values.traefik.yaml

@@ -107,21 +107,31 @@ ports:
     exposedPort: 25565
     expose:
       default: true
-  shadowsocks:
-    port: 8388
-    protocol: TCP
-    exposedPort: 8388
-    expose:
-      default: true
-  tf2:
+
+  tf2-main:
     port: 37015
     protocol: UDP
     exposedPort: 37015
     expose:
       default: true
+
   tf2-rcon:
     port: 37015
     protocol: TCP
     exposedPort: 37015
     expose:
       default: true
+
+  ssocks-etcp:
+    port: 8444
+    protocol: TCP
+    exposedPort: 8443
+    expose:
+      default: true
+
+  ssocks-eudp:
+    port: 8445
+    protocol: UDP
+    exposedPort: 8443
+    expose:
+      default: true