Add proxy-protocol and remove tf-ocloud

installations/applications/helmfile-etersoft.yaml

@@ -31,3 +31,8 @@ releases:
     inherit:
       - template: default-env-values
       - template: default-env-secrets
+  - name: tf-ocloud
+    chart: ../../charts/tf-ocloud
+    namespace: pipelines
+    inherit:
+      - template: default-env-secrets

installations/pipelines/helmfile.yaml

@@ -31,8 +31,3 @@ releases:
     inherit:
       - template: default-env-values
       - template: default-env-secrets
-  - name: tf-ocloud
-    chart: ../../charts/tf-ocloud
-    namespace: pipelines
-    inherit:
-      - template: default-env-secrets

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

@@ -7,7 +7,7 @@ traefik:
       entrypoint: xray-edge
       port: 443
 shortcuts:
-  hostname: xray-public.badhouseplants.net
+  hostname: xray-public-edge.badhouseplants.net
 ingress:
   main:
     enabled: true
@@ -23,7 +23,7 @@ ingress:
 extraVolumes:
   certs:
     secret:
-      secretName: xray-public.badhouseplants.net
+      secretName: xray-public-edge.badhouseplants.net
 workload:
   replicas: 1
 ext-cilium:

values/badhouseplants/values.traefik.yaml

@@ -5,6 +5,9 @@ ports:
         readTimeout: 0
         idleTimeout: 0
         writeTimeout: 0
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   ssh:
     port: 22
     expose:
@@ -41,30 +44,45 @@ ports:
     exposedPort: 25
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   smtps:
     port: 465
     protocol: TCP
     exposedPort: 465
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   smtp-startls:
     port: 587
     protocol: TCP
     exposedPort: 587
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   imap:
     port: 143
     protocol: TCP
     exposedPort: 143
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   imaps:
     port: 993
     protocol: TCP
     exposedPort: 993
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   pop3:
     port: 110
     protocol: TCP
@@ -77,6 +95,9 @@ ports:
     exposedPort: 995
     expose:
       default: true
+    proxyProtocol:
+      trustedIPs:
+        - "192.168.0.0/16"
   minecraft:
     port: 25565
     protocol: TCP