A whole lot of updates and fixes

2024-12-16 12:55:51 +01:00 · 2024-12-16 12:55:51 +01:00 · c1e7fe0fc7
commit c1e7fe0fc7
parent 4b8a0fee0d
17 changed files with 307 additions and 170 deletions
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@ -95,7 +95,7 @@ releases:
      - template: ext-certificate
  - name: server-xray-public-edge
    chart: allangers-charts/server-xray
-    installed: false
+    installed: true
    namespace: public-xray
    version: 0.4.0
    inherit:
@ -103,6 +103,7 @@ releases:
      - template: default-env-values
      - template: ext-tcp-routes
      - template: ext-cilium
+      - template: ext-certificate
  - name: vaultwardentest
    chart: allangers-charts/vaultwarden
    version: 2.4.0
--- a/installations/applications/helmfile-etersoft.yaml
+++ b/installations/applications/helmfile-etersoft.yaml
@ -47,3 +47,14 @@ releases:
    inherit:
      - template: default-env-values
      - template: default-env-secrets
+  - name: server-xray-public-bridge
+    chart: allangers-charts/server-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
--- a/installations/system/helmfile.yaml
+++ b/installations/system/helmfile.yaml
@ -17,8 +17,6 @@ repositories:
    url: https://coredns.github.io/helm
  - name: cilium
    url: https://helm.cilium.io/
-  - name: piraeus-charts
-    url: https://piraeus.io/helm-charts/
  - name: vmware-tanzu
    url: https://vmware-tanzu.github.io/helm-charts/
  - name: openebs
@ -52,17 +50,6 @@ releases:
    inherit:
      - template: default-common-values

-  - name: snapshot-controller
-    chart: piraeus-charts/snapshot-controller
-    installed: true
-    version: 3.0.6
-    namespace: kube-system
-    condition: velero.enabled
-    needs:
-      - kube-system/cilium
-    inherit:
-      - template: crd-management-hook
-
  - name: cilium
    chart: cilium/cilium
    version: 1.16.4
@ -139,7 +126,7 @@ releases:

  - name: velero
    chart: vmware-tanzu/velero
-    namespace: kube-system
+    namespace: velero
    version: 8.1.0
    condition: velero.enabled
    needs:
--- a/values/badhouseplants/secrets.minio.yaml
+++ b/values/badhouseplants/secrets.minio.yaml
@ -1,47 +1,47 @@
-rootPassword: ENC[AES256_GCM,data:GEqZhh9YWYxdezI+rDS7EL/Fa2A=,iv:pjinEGyjUfncqE+SX/a5YjojfjvUIaTVzp4I79+nNK0=,tag:3dx+oUo51OWDAu1FtjcypA==,type:str]
+rootPassword: ENC[AES256_GCM,data:X4PQGfbMObmHkD7Qk1AGlnMK748=,iv:+obQfzC6F7cBNY1d6WpMPAMRZgfO9XXc8jFPZ36ShLs=,tag:79EvpFwM+vqqhBazwejXHw==,type:str]
 users:
-  - accessKey: ENC[AES256_GCM,data:QHs/0+txnek=,iv:M0lIhbdn27xFa0f/goOZbIzN00RBlVCsmZJS0x4QvoE=,tag:NrDFXGxWA1arY52l3a7Osw==,type:str]
-    secretKey: ENC[AES256_GCM,data:zN25a8xFwea3GtAMMcyDYMRrIg==,iv:2CVp3ADF8RMsmXO/86ShTvb4ruS0jbIHxvBeQRahbzA=,tag:fhvM5yixaice2BCNoPgpLg==,type:str]
-    policy: ENC[AES256_GCM,data:1XOH/+U/9uY=,iv:9/c98UTB4NBUFsxj86YUFxhiJenuNEZGiuMl9YFF53s=,tag:NUil97HloEMFS1x6ZxduMg==,type:str]
-  - accessKey: ENC[AES256_GCM,data:aTKN,iv:SAxc5SRZMP8G7/SdW6IFZwC9SNcadwT3gGBvd3wh38c=,tag:Szno9wz255HyeRwyDPiJMg==,type:str]
-    secretKey: ENC[AES256_GCM,data:PZ0ge+5Db7gnOodUlUDiDD0dZ6gckwOQRQ==,iv:Em9tBkzLbD5FPDMDXxjwC3PP4PUZVqoZI3xpLTIyCh0=,tag:o/S05Z0qmM9L9/BEFV2p0w==,type:str]
-    policy: ENC[AES256_GCM,data:wJO4,iv:ZeoJKeczcS3B5+wKUx7XXytYH79bUgF2UvWgOlTunxc=,tag:xeUL9zdLyMCkya9F3gkldA==,type:str]
-  - accessKey: ENC[AES256_GCM,data:ByU5F/5UzgHI,iv:+cLnf5oApiG9ZsR5TFeRfhnkPheMQxJ8sZKrhfxXfZ4=,tag:HwMAV4FkKRfEgNgzVlEfRA==,type:str]
-    secretKey: ENC[AES256_GCM,data:Cqu6qHxj054sO6kv6VV4mfbbxZ8=,iv:TQlrh5aJDwRcU4b7vPPH9fWkQnB3ZD+zGlmBHIwdzME=,tag:lnNeclEvB85O1pZLm/5a2Q==,type:str]
-    policy: ENC[AES256_GCM,data:G8Js4e7VdBlk,iv:Ur1+a0meAHtD7Whjf5wSL9M6ZT0USqp8lbeBWa6mE7I=,tag:f5qnTV/zyxpbTWNjhg4MJw==,type:str]
-  - accessKey: ENC[AES256_GCM,data:LBjJl8U=,iv:h3Hncfvw44bi/3d+fUXgyH2gxjHu/WglSHBVlY9IY7I=,tag:U/FYmzdAoeHXI1FPKrvw/A==,type:str]
-    secretKey: ENC[AES256_GCM,data:WE8Tgo5qjELpcmnPndNIDg1P2hMC0Su07w==,iv:bSSGbCNXdJFZi2ej5eavC/16a5YNuE4yHkCH+UiXfiA=,tag:BBu1uQWq7JURr1VBI+4aLA==,type:str]
-    policy: ENC[AES256_GCM,data:6XCF/6M=,iv:5OkoexjDekMgJM1HHuWn1h+s9D87odUtOFlqBmusizA=,tag:/MZcxjK6SDonoPr7HLRIjg==,type:str]
-  - accessKey: ENC[AES256_GCM,data:BLhlKdFIAbW9,iv:4okVf620xRYu6I6/Jd4ikNKO1NzsP2d8Md527hUrQZQ=,tag:NCV47PfvhHb2K3+rykI90Q==,type:str]
-    secretKey: ENC[AES256_GCM,data:lNDMsuPm5taDUd9kdMPC8/7fG9tJmhZl2w==,iv:wXVq0oRe6E8XzR+X7XjwSGCiYoFfQBvTu4i2NRx3dBs=,tag:5+OsaFxPbS6tzK877SodHg==,type:str]
-    policy: ENC[AES256_GCM,data:eOvVqkefvxa4,iv:u02DHDp5RogxLU+417KVNMyV6z8PU6Vj92Ut2Rxmb1k=,tag:qT2kjWxheinLSdLWzYC5JQ==,type:str]
+    - accessKey: ENC[AES256_GCM,data:nhagvffOzcI=,iv:HvLmKNCLapLpzpWt/xBRmAWhf73SnDA5qqbmOTxZi/0=,tag:dzBP0Yyv/M6Xvjv+fpFDew==,type:str]
+      secretKey: ENC[AES256_GCM,data:9IEqubInFr+m9QAnttGQYQTtVA==,iv:adfRWA2TYK+KrcnmziiBA3AgUZ+TUOzA4HfXUITQIFM=,tag:xDcFCmJA4svH7mcgeQseRg==,type:str]
+      policy: ENC[AES256_GCM,data:gQd5QKGHVrQ=,iv:nTWo4wHr4xzZn08DrJGXeceZqdVjy1ZY4bX3kMXl7Kk=,tag:5ZjPAtQyhsg7nBQTA2Kr7w==,type:str]
+    - accessKey: ENC[AES256_GCM,data:XDX5,iv:520OfJb8RJgWpeAJ9J4V1jIAwXl9jT/V7GuAMr8PmBY=,tag:LOETQbQT7kwA7EIjAlPWLg==,type:str]
+      secretKey: ENC[AES256_GCM,data:QlVpl3lks1P81dLQdUuM6a9irH2ny53ZsA==,iv:eFADkYo9oj+ODQ1CPbIVc/rfA6rr8iF7wglfFksrkDo=,tag:JyFMTyuuQyWHaMLHKXOxEQ==,type:str]
+      policy: ENC[AES256_GCM,data:yeC1,iv:FE7WNpWN/dxgkBi9QJxtYRzZTnpgjYJ/ar9/45bETMo=,tag:eXN54Gvw9PXbp/vNoZLrNQ==,type:str]
+    - accessKey: ENC[AES256_GCM,data:drqrZ3/nCyGX,iv:ey3xBAhJG3htB6sehhAONQApwUgR0redb11wIyanyhE=,tag:2PM5xvwY9YjvJLm/+clF+Q==,type:str]
+      secretKey: ENC[AES256_GCM,data:iKpEQkDFqYn7k5I2OVcIDrWDIpQ=,iv:m7FeYAIt0/jm66gWenOrOj2X989vpRQKr+GYdw8mrRU=,tag:GHOPwRLdRfpc2wLH4tX/Cw==,type:str]
+      policy: ENC[AES256_GCM,data:4XqHiO4Ut76p,iv:KbwPkexAVDaahi4F/Q6Wh6geGy28OggE2Rptmq1Lxrw=,tag:M5wFcNICGstXXGP5e+umcg==,type:str]
+    - accessKey: ENC[AES256_GCM,data:ghT3JzY=,iv:65gARnb6O1r7nSJioVyZs7SyBk4aiDgyEq8iLFeMatI=,tag:pLx4r6txAjBBjnmG7AcTUA==,type:str]
+      secretKey: ENC[AES256_GCM,data:Eq4OG7kPFxkhQ+gX7/ICSvjaWxf68nUs9g==,iv:1bgYfjXZLgVvcPTHNtOBaRKV5dWp/RmkisRdQUfWJqo=,tag:t8T9DY6+lr4VPofnOI+g+g==,type:str]
+      policy: ENC[AES256_GCM,data:7bF0/18=,iv:k5zb0KRyfOQvSWiVhy0au683aJhthrBoqxLHWyXuQD0=,tag:y0P69LtUb+dBc3BARp9p3w==,type:str]
+    - accessKey: ENC[AES256_GCM,data:b923YDOG9Oxl,iv:rSDiwfWEzCof7Lj5zkOpvcH2p+zI4iqQC+uPxQUUvyI=,tag:gRUDQha2EITQ1VkCurnT0g==,type:str]
+      secretKey: ENC[AES256_GCM,data:iwpLzRUfZTqWWwzw+KOjko8rMcWwz0P4eg==,iv:THFj+8ILYlTHU8dAcCony7bI/5q5A83dRsjHoqeXa74=,tag:bo3VK4WflhXN9iGdkthYcQ==,type:str]
+      policy: ENC[AES256_GCM,data:v+H0vmJXHeJK,iv:S3JjrjZm4XdJnsg7hvXBsnZ0y+QSVD0zPS1cJlGxIw0=,tag:KBWkrID8knK6pvB8oa30ZA==,type:str]
 oidc:
-  enabled: ENC[AES256_GCM,data:3tHt2Q==,iv:0FgDbZEuhW1Wkh9In/JVmsiuu78C/reapgdWW+U4nHw=,tag:GdCPBOdsaDoLj4jmH0+Hyw==,type:bool]
-  configUrl: ENC[AES256_GCM,data:4W89kL0pq8uTsyXcZGLqjGL1tyquypWpMIbLSQzdep5keD7LolY6ywpyFIhVYO0VcQwoDoW8ISC+obKXruAk1QFuHgyNLhNq3YhrDqnwOdi63Zd1Mm/G6as=,iv:7fbK4s26w1Ijq0cxLBCO9YFh/qLL3biKI9vTgbH8yOQ=,tag:3nnORzg3oS7QKMn3bp5wlA==,type:str]
-  clientId: ENC[AES256_GCM,data:lsiy1i0=,iv:M6+WHUOxPCmXAmAWG4HfVHQpHavMvIBq0BoI1B10Nbs=,tag:4VYwGCH0dnGbGK20UKLFpg==,type:str]
-  clientSecret: ENC[AES256_GCM,data:S/yGKXyz0uhNKuiR+fYCuR+fy3/LkFphliJ34ocbJgnJnMwzayiknCTKxEcaOeK99fzpAmsEQL48Ow3Znm+WrUpsCleXavt1yck48eNFT53fnnCdlZv3eLoy0FHovDti9VgJmc4oxXDv3k54XLwy3ZhJkwihafdnjJSksU8dE9I=,iv:adCVwAO0ptkrkrhcfKoKpCKqd6nQIh0voeSvVHOt3BQ=,tag:wIi4N0N8gBrKh01FSu452w==,type:str]
-  claimName: ENC[AES256_GCM,data:/pejm+pH,iv:mKK58CmCvMK+RYXdkOdDLNfrI1ThBDolrQCfyGQXYp0=,tag:HDS1Yds+3ymNCntcsfFGrw==,type:str]
-  redirectUri: ENC[AES256_GCM,data:9I9YCP91QdYz70b7j1+ZZ94Cgx0qsI2l9HL6Vylcfg8a7sSn4XkHgWeevm19Kj4=,iv:1Vqmtk0Qa2AFalLnb+js6AbFQ8E+Br5ykHMWaZ4xOuE=,tag:msvWckcpfuTlGLxu05nrvA==,type:str]
-  comment: ENC[AES256_GCM,data:stVuHIZCtW8RYzEjDrRg87rxyuM=,iv:eF+M2p8T7bI5pgP5kQSXGvhF58u4vaIueraCGIt7ims=,tag:RCq8yrIFLYE3ERayU7VFCg==,type:str]
-  claimPrefix: ""
-  scopes: ENC[AES256_GCM,data:J2OFtmd8guKLa11wMxIqssqMdpoB7P7NtejO,iv:LXr0zpnQ7p2DbSFsg6cI4AN9CqhFGwinjHU41auAfOw=,tag:2FKy+WHUbkteCsk7QFD6ug==,type:str]
+    enabled: ENC[AES256_GCM,data:c+ODwg==,iv:bY7yZXxhj5fGdT85yPEGD+2lsQ2l0+6BJkMcYzcZCwo=,tag:uHxzyeUpypMvcswCVv2pGw==,type:bool]
+    configUrl: ENC[AES256_GCM,data:pzbhMON4qNE96d0AYDO1ojvXvQXBVgIWtjeRkpj7psDo5HBOLew73dzDPJgThWsZYthv5ROaLqQo2hmheuc0cP/AAa8JSaTGWFD13iN3d18iPI8ZaxnxZFg=,iv:GEYB7lX4+NWeD9VgjFu1CChg/ClDGvO3rGkuxvIcql0=,tag:QWEg0kMMcmIcJdsFgSCYqQ==,type:str]
+    clientId: ENC[AES256_GCM,data:DXn3ZGs=,iv:xHYHMB+LpMwdGgiiMcq5RE5idlEII1sY/7NWw0rT3aw=,tag:oG1pOyPnJCd1DUXtPQA8Bg==,type:str]
+    clientSecret: ENC[AES256_GCM,data:XwMEAxsyYnN3b2zTSIy7a3WGqGAQLF8MSQPMNXkx/zVNd9q6hVINXRbqeVRgF+y923DZYO5qnNdKhrVgby1qg7xYxgPfkK/ouDrzuftDa4agEjzJXw4QXRpHpaWujyYk3ltaRzi6ySgbMwj2z6G+ZMsbKuNKbv1yS1NOI/T45+Q=,iv:MkiPUjZV0HslDSZwc7sqzHzrejHRRVa6AIbLYZzciLQ=,tag:hp3uZjYJcDoalUOxGGnOGg==,type:str]
+    claimName: ENC[AES256_GCM,data:Mml/efpg,iv:imZD0TjiyhQRntes4Z0AcnjvsTjgdsRaFTnhFlqcxQ0=,tag:+oAMOz4tmi0yvmNPiDuqsA==,type:str]
+    redirectUri: ENC[AES256_GCM,data:lRx520z6aq+UJc8a7NY/MNPQjOuDqY0Xuha9bOJn47tR+pkq63jh1ShYhmOM73Q=,iv:jCG6lxPV5jXdyvF7Td4yasHiqC1U22Kg6LdLqj8rKh0=,tag:5ix40wSSEW2JgzAZlgOuIQ==,type:str]
+    comment: ENC[AES256_GCM,data:mhzyX2SGy+12XjOl6PICR2Yvazs=,iv:o0O70wKypt6+HB7ex1Pno4A4XxB8ldTU5NTh627vMcw=,tag:1hlYLXJyzhLb3x0oYIee2w==,type:str]
+    claimPrefix: ""
+    scopes: ENC[AES256_GCM,data:ztX8pA35GP2+kLLvQo5tLcsGdz2+/AGrwFJw,iv:qldaOWV5asc+WAAiHVAYoNkXVNMPVZfVTIHj3jd/cO4=,tag:6A+JiirnO7aMjO8i0zYbjA==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmS0RuNGxQZm80TUx2VkpB
-        MlRSWUdMWVBlRitPWWNmMVNPWjdlL1lvVFRZCnNKMm5TV01SQlgrQ1FZUkFaSDAy
-        Vzhoci9uQ1dPR1lmeHFRa1Q5QXlzTVkKLS0tIGNXWnkyUjdsaVBJRnpscEt4dVc4
-        Y2dldGZYNEs5KzVSWkR2bGpMQlIrc2cKRHiTbSMZtshXVq1fNWsXcQHfBUE++yQJ
-        CWXSmgoSZhzj8vmU4kvMtbuKE+S7fsiUJibtIx1y/Tl2EFtpsiMMvg==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-16T16:50:30Z"
-  mac: ENC[AES256_GCM,data:VDJdUUtfLCw3ZD+IWgVh159zhUtjVfYTs9nWDNIUDVW26Jtaz00dDr30QCrCIHzRy5g88vYDfUrLdRE5+EfM5cZRKVV0TruF6KBYP+4Un7fQG/oRtHZu8CgDYVpEoUcVutRg4V6xJhT7mRPlPH48/8wt1aL1FId4HIl2jvO6MYA=,iv:eARUMEHSsUKhEm/7iMw8MRT1EWg9s4C9Qikk5uVuYpY=,tag:o2SgX2UE2VYNyvGVWT/OZg==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBONzFwREQ1dGdpS01VQ21I
+            RFRna2QxejdiSUppZDlaeHpNdzhFWlQ4ZDE0CmNpR0hNMTZBWm9FdDhWY24wc0hD
+            RFBCWHhHekdja0xnL1BVOFVST2FGOFUKLS0tIDRkVW9ESnJLWmtuS3VWRDFna3hB
+            aWlhcU9qSmNsRERJRDhqc1h3eVVOUncKQc21maFwBHZzD3xMedoqmCEFOwaTZkG8
+            OD0o9sqjHqrHj4vqlWjj2LwAAoq3bL/ttvbEjm7jm8tHGIHTh13TDQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-12-16T09:16:55Z"
+    mac: ENC[AES256_GCM,data:+gZ0lhBo4j1GKfGupQh5UxYt6C+yfTRrMM2rwabU8Tr5ZNWviNfGQiDk67Dyio01NH4wAL6EhcL+xwG0+94DlTd/++VieKBQuCABhnugi0wvJO/wp2HOjotmb9hWhF+kIXLj2bPdkd0iJQuZM5CbDy1XLUlYaRT0H7s7IGA8QI4=,iv:jhrH7+Io7lx5xMS7feq/4g5iW58QFWjRyCfDoUZVC4g=,tag:6ozB9/8ULOJg8WHvAZYgpg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.2
--- a/values/badhouseplants/secrets.server-xray-public-edge.yaml
+++ b/values/badhouseplants/secrets.server-xray-public-edge.yaml
@ -1,11 +1,11 @@
 files:
    config:
-        enabled: ENC[AES256_GCM,data:Cl5JhA==,iv:3IxcJvmVpTxcmInnQpbFC8/u2QowprZS1hfl7Qsv81M=,tag:7JpxcYdyWpDTQuZBzK7QnA==,type:bool]
-        sensitive: ENC[AES256_GCM,data:lY94Op4=,iv:VX+OfDpDGQDATnN5h5MsNHcRmuhbhPZi7vcrsPEwU7E=,tag:JYcqtt62Ap2v+BQ3x/f+uw==,type:bool]
+        enabled: ENC[AES256_GCM,data:Lujfnw==,iv:as862WmCEy2BGX9w3htlYE8RWVtFWC+PPvWWM+Sc6WY=,tag:2259pvTiVuU4iPxrqKJKRA==,type:bool]
+        sensitive: ENC[AES256_GCM,data:JOaY3rI=,iv:hWnGbTXh9enaBT7VKKO9qTo1HJlfqYOVCXvXU7rW1Gs=,tag:gb2T6HzNPYSPYwzULQQS9A==,type:bool]
        remove: []
        entries:
            config.json:
-                data: ENC[AES256_GCM,data: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,iv:KNzg5JFuRLnMFp8lkDXhFF6PZRY6USe1+AVK+jDKsdI=,tag:NcpY459+MM1e8vAMiSjpWA==,type:str]
+                data: ENC[AES256_GCM,data:fHHc6CbD9sBYc+KnuEDEObhzGIjkKC6Ouz2tOYpQ8hj9QMgIStB3yGGnxgIxsTytD8jZ5hMCRim+YgyOQOObrmBC3WYSenhq7RgeRZV+YF/gRAtGgcTSccQHVyOs5rXCnQwZXWWLr9stUefsj2xoxblKBb+3SmDZIbF8o9xEUUfmwB1dZt0oav91xwVK8g0s8344WxpV/WPWatenp/V0hS2PjQpEt4KQSmlyU74qbVcCez4qcCBoDEojggQXltMxFJmbDM2OV1tEpvUSj/1GJ97IlrAiVEm0FqnblJxmSvoOW0qGuxtSUHe3BDmY3YaDmVQ/POQnwR93etz1TgXjBPPYRdS1R4bQZBMbKnvmcvXeu3AMeaLlcx3yOCH/eQSvBMCdh+DU0YWiomSjBz66irg9g8GWa4Dm8DeTfaxhTbm6g0MQ3OfuJdD5eeDLgZZefPulPWqrwVVkNv/1OYuJnPvsDCwblwOycYS7+7wrKK/QHmV0QPZVnF4XyKGSO4qzZQ/2eWMCmcvY+L8bpAqO/hMvTAnTHanY1REXRm359yAgJawgKh4ZVFL+wiC9hEJjP9ySWEesaFyIQaiNsn57/+7yr5kBiJGwSg34tTpJiN02lVQlsFpqsdNi9WMuVIjv/q4m5xL+isUazeDAC0B6Nu/0k5Z9mapv5JMU3tVe9pRRp8xZ57vN+eVa17e2UijXXf8YXkd80xcgIMfjf4xT3TfzsEp8OY6lfKz6/3+jdDPMPpyt6dFGGvqA99BO3qvSmpKZn9zU+1cSD8UIlPoKexruNdKsYeo3X1Kt88SdlAqMTDi114quNS6WVpXHquc+jX5BKw+6UbLacKuaRaJt36oupypSzHx0XhhTiDLHnhXPw2F2c1ulsjhpJPhEipXcmQOw8KdnRYGtygBiK9FGXKpxLdRwPCoeaQRs/xSbNld1+QGO8QHJqEZBOuD3+jeooPQ0e7ZSm37uxlZ7fT00R+MMSXUE4r4cn6wk0Q3me2PE767LVEKq4HkfF3NoxLD3sz3y37QN9iRl5KBxXFwHiPAeKgens48GfrfWTUn5+XlE0cOfdhk3ACDT3gHOAWO2a8s1682cK0uVcJ1JmpNXrNinBUeY5LXh6A/LJDReBbOpnnreyBOBCYHUslHvVq4CD6B2BzaGjhmNrAHC55g/UEHg5clv0FpOAUDWgWz2fEIywpD9Z031llXPZaRzA0Z8aMQh/0SqSVW+eiLCFINOMPolbEnwourqIEd680phk3Kmi6g5GQHuS/Fk+BZTUIzUbSYnnilL7oif9sWPujZSvlbB2qHWTM5WgEsN2CsmI0cLHnZTVVt9IeIFaJlo87GnrvRDHt/Q3ErHSiECciNwqSe6Pj8TBcAyvTpmEok58xZy7AcnpbfcSLr4GBmiRkoiNZqUsq9f8BCJluEZ6stIx9TOg2sX+wgJVGvLSZoem8WNlSDtfX93XOhRUXVLH7RbrAj7H0duft83D90MIYU9bUEUCtVDqzTQ5WFvLZQnR21snBf/xTvPRFn/S5mtaC0q4IdkIz5CbS8y4+qkdSQFk7LEfV7HEniiNbP8TX5bDBGe818WGr+UUotBUiLaq+ou+EWouoBnAqbpQBFSomhmPQVxRyMqD5RDsMAxxQoAEgCgyUAUGuM0Snmp5mKLv383z9nsOYam3qScO+3Ltg+xNnqyyuqMSpvKSCQ/rX80H0gfCaw7te46oz98D9Hb1xrZelccx2WjVHE8b1QIyXDWf5eqjwza0ynMQbZmR03B3PqHTizGileWMyfXfFh4VdtHc3JSbk5d+SlYLE+8OHuWSu7MPNMeFsKYSlMO0ul7/pEECHZfi3FubpJljP1fiOLN5F6Dz0JsJXIlP9ggtnxlDfNfaHnx+XWSxbiXfqZo2jQFn1x6hyom8Rw0ULeEhSoWBfCO+Az6cFukoFzS2V4gYxEkYvvoq6mbJ/pC9g+uZynma6yaKBnTSwwacbZ0Xgo+YCf8Jf5yAiU9L0Jjq/7q7M9c6kiK0bTYGhgUwcb0U2Gnkqmar/KScJR+CpyatQz8m2EfzGf7Ytz3t0gX0MPEQYX4mMxgPvjKGeNzTQoU3lDBiv/Ca+qbuUKEFdB8V2bkzzyFBVSv4dEP8DkntUqW1OL36YWkYdldwMIhtp4CKW0fZ6Yhzk2HCo1z6b+Z5mrqz/atqkUn+bTy8YhEeMpYz3FzMn3EldU+2BfM5rC/f6dVIUYxmS77UyDZf0LTyZnvsPNKaBZOP8YW7tzKo5bF5P8I2oZFsLUkR5YC75HTw+fNxtUgLB9rG9IpucC1EYZJo3CWz51vkg1B9SzFda3IPvATeYErFIWxnmlq7KECCZqi7/0dhcH0Xyw5hTRY0IC8RfLPwpfpymVlNZ1KflJUcP4hIqQ7yMm2GgnTCHmoZ9mZ+JiFHMmL2/bvX94ylEDsfg+rtMgHcgEeHJkghuKQb3VpdJBHU1m3uD2hAfuM/WGJjVMgf6OQ+T36LXWCAzsDuwV9vqRFENachN9AYyK/M9Sg33gA1QPGhssuaIYSnbkTaSPBQIu04VFi+KjQMrP6XvIKOnIPbZzBs8aAOWgqPry0h2e3FveaoRbI0Q2L3gzs00bk3GjN75GmXQ3yNmieLLUXpmmXoG7nG60f5tr6LWhmsP/70awdbA9L7py3+Po2ZKWsM8AqkA3cDZhFvltDpaXKHH2J0Rtj2TFU1LghlY/NGZQQAuXgAjZ6fBLLl3xSVLWFaoKt2DI7inDimqSWJLaN3MrXwXWLg3NcGhCFVmW7ycSM/Aj9rHHdfXNEC1h/3Wfkg4Hm/nwqzGJJZ/T+r5zXohkvaIrIHjkyzrSMONUFVtTMVRQqGiNrfemPImjq1z77aH1KOOUyRDxQXBAARldZO9REyh13KILPYuiMZKXXUnUOClg1vN6ozDOKskgXQdXXzBfe0Pt1Y3TeRyoVCXaPlTgnF/ozFNhQitvezicQ6+m8QAE+RIFUsnzOxw5DsJpHXaHz3z/T03k0PUTIrTXW20MVdBTLcT6Cf0KWVzSf5QSnPVDIAa0imGZhmkI8AMEzMDCX2t4B7XWw1vGBI1xfq0wV12wBZFEXcFTprl3p/8XqmEcBHctO2R7qdY5RgB3HhMvDOyB/z0dmVOpKTTUgoheDe+pEtU2AWVwX7oOzrCCtmdqNTDwyYW7NRfKLsOtK5fvra5wnwzSLDwi81SKv39z44TxqeHG9HDGcnkfOCwTG7QYbtlNN7U+JhQUznLCcqsoqChJ8C6aNdlduQ83aq4PHOR8dX/VtJty0oSYHAkcQcGrH/6mx6CfMR7gIqvG9TfnUaCen+ISnjYjGo6FPsmg0HeDQfxiBs+F5OVQSOseYwWoC6Zxpx+ZSJgnPgHICC6Hyaoos8pfzyJYAVTOxpxWLXcKYUpiNLx8VbO70NWHvn+bB8tUJPqnKx3T75gwlcykD/xgXmOPpT8ulQX169gZ+6CIVom8QNGKv00mDjZiicFilmx8fmqu2fUBgKOQOPgN6Gt4ivheHRHBtaXGG2cAp3a+fdarclZHGKky9hhNML7aQ9AvoyFN4ZqfK55ToQoMx5KwpCBLEHBxxriOxuFNhlp3zLXEBLlu0lj/ZQqXaHshpoMrfAQ3U4lKtQp/OaX1+FmcMElcuTQd9DxtvCTJcj8IxRAIlnc04j/NPahZw5Gb1fUGmcVwX5zB7emTG51aFYesL6r0g20bN5syLYqbjnNiE1XFxlVtzdqLNAkLf31nKVTdTHOoLnVYxSiSR08XFxdaycpvy41O2+3PEHvsrcFreOeT+0WPkIEdwzYUZMMvlG6+bJSrjpWkeURB7BrNn+MVkmaNmufs4MO0p1NgNKxwwoPobWJ45IkeK8b2EPC35CixZm9BRBQAo08RSkkgYiCV1AkRd0w0kMPV3j6SX490m9fkk9D9oST4ycw3jGXOv8eGMXd1OnUepzvrnVJXHxgobJ0JTHUyJ4RsQTKlUTF6Owaw8Hn2theopULrQrpsLlByeKqjE1IumOnnmo2RAK3jkeqHiHpp6/f6FN2R/0+n+QkUYnsNfN1Eeed/e+E7odXNeZuMPOy+8AgiuQ6hjgRrd4tsP+mCPQxyKPw0RQ6C6I9J2tPt9+k3YsJY/EdqrKJY5LRBaVNCCOA/xKbvPe09Er6AfPlM3oL7OtsnIiU/jnAtmssB4yz2gey6SouZlVBrvlpgy302FMUbU+ak0bolP7Pyg1YgkpMg7bpUmagXbFPGqDIznO/JEfJZt/NpPo4hQm4YYw/vabwJ968kilrII/7plIwH1xVXkC+ncJPmqEiGYEUuWGqmCwCtumPHD+N/F1G0bj9IoJvv468z0czkJVsz2nyPfWEJmsmU2SQvhA1VBZwidoGqQfkq66iWmfolllPSyBYvvv6AjwNE6PH9kARlGZVbqQ8e0z0UPJeOyEe5eSSG6KCHoMpjJJ7zBJD4pcckDLzR+oQTJDOSyynIIiFLm4Bam6YGDIHnB9AxwLSex8xiVCUq1pxj5H0b0oaUDNrw/5ZPIhIrVfdWtiXQHVmuHcV8flHbrSWJJECE8NFsA71eUfJAnp8VCE/q0V0/DUjA8Caukq9XvWhWviVwzhaWFv8mQSlRK53tphC7W+seTSV2vd9SjXEIHjjf9H4pXKHaEXh28DWF8JExeyl0R3pKZPhKj+95D1LYdJ6V2ZnoE7g==,iv:MbjhlwS9GcxfeyhTJd1PcXzZ2EYV/Mrzd4pRYdaESwQ=,tag:rMGhJdjv1EAARrKXruS9+g==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -15,23 +15,23 @@ sops:
        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPK1NXRGZVdVNuVHRNbGZL
-            Rkh0ZXlJWWExTS9GQ2MvWEhVcDM3bW81NEg0CmhoNERKK2NnV0tUblFqRkU3NTdG
-            M05paVlkZnlBUXViWktiL0JXb2tXU3MKLS0tIFN6anRrSmtjVVVUSEtvcEIzaW82
-            dGloL2k2aG42MFdZMi9UOXQzMS9DZUEKVZ3PysjRm+Lbg8TKQ7tzLCBR2NH9Zibj
-            sO15s0zCsiDgcXweya9CfVPkaFfOMVdpwrQq2w3eW0ZbrANgNx7tfA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzQXRNd3FZZUIvUGt6Wk9t
+            K0trZDh3bHZhZnpkSXhzRjM2dmFkZlFpWjFBCm1nTDFRWDlnaU1nWnZya2dENk81
+            Y3JYdG9CcVJXT2lGdGJlbWZacEtwVzQKLS0tIEZjd1N2RS9lQ2ExTmVmMTVEWklQ
+            SldkU2lCcytkcTNFdmRqS1FOb045ZncKrf3D8LiZ5nIf82cbHDnuKlG45cFKGyC1
+            P4zk4X37/Y3KHiqOc1iofzUH0R5mZ3KuLUJUwNAux57dEyraVt0cpQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsZVU4cE4rNzAveDQxM2Zy
-            cnMrdGRUdUtCTHRrTEh6ZS9pSHd6Qi9ZWkYwCmhBMEdybld0UTgvamdJRld5dnNP
-            bGRsK0VvaTFsVEJpSi9IT0QzTTJqVkUKLS0tIG9HQnFhOG1QZHlVWEpnVVBzeEFX
-            Z1JyRzIvdkpmU3dhZE5qbmVpUVZ1QzAKRM4ee8TIHdvawdc+RFJ8R36yMICtClU6
-            Kj9w+4t0J86R4dNhysElxwyfNvcmwSZCUv6xYTiAOfH5HKMnKiVFEw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3YXFlcko4b3JEeWtEYmls
+            WngwOFhuMC93bm5mMzEza1YwY2RUVUoxaFZZCmN5bzNTQ1R6aDhrZXdWd0doR1N0
+            eHVZVXZpM1d5bzFZUzdDVTFOUkc0VWsKLS0tIGZsTFZQdWxIQWZKU1VpbUtTTXR3
+            OGg4cHhjMXgwejlsbHV3Y0toUGFWemMKvFPCxNsi3HfPnCzKgWYG9uSpQD5Kt6eK
+            3aQXKeq2d+9DbRB2gfLxbL32BD+SrGzmX7OHF5ca8zb9bJ6/tD1ngA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-20T02:59:03Z"
-    mac: ENC[AES256_GCM,data:a3RGi8kr/4cmzhCWl6st6aGfDpS+jYAQ4z7O1NNlWUldLzJ4vpxq/qf/yVn7sb1GWL9W5QNGOtb6ZG8TzEka17NS2nHAP+MYYyoa0EVEkp+A2PDa0GBvDc/Jv7Uq/fHsCxpdJ/rgDm214SQ9VwZA5BY0fNMthJlUrnu0EIrKpBM=,iv:csIufoBA0RlGofumozagRnwFPZ096N7p7474WHfJDFg=,tag:Darj+4eHoQIVr+XXRDCIiw==,type:str]
+    lastmodified: "2024-12-16T11:54:38Z"
+    mac: ENC[AES256_GCM,data:fmywe1d0JFH8GH2y3qfVeIaxKaQ2h7+1WpixAHEyF4wkdM9FtsZgZ/36i7alEaaTOPIfWQdO0XQ1Eb8SAU1qRx8CADNSGIl6tpj2ObAy/SwKNKOimY23MB/oPJDhTDFXuzL7wT6w/59qoq4WQPUx/uZ+ySJTwVyq8WN3OwrPgiA=,iv:yqgyo5o/0XMkqMWbFWMXcJbm+k2YPFMnroZimueiKEQ=,tag:3PSzC6in9VZYFs+u3dOqRQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.9.1
+    version: 3.9.2
--- a/values/badhouseplants/secrets.server-xray-public.yaml
+++ b/values/badhouseplants/secrets.server-xray-public.yaml
@ -1,11 +1,11 @@
 files:
    config:
-        enabled: ENC[AES256_GCM,data:p1A00Q==,iv:1uPV/Ior7FZsFeLStYwzRX+zb8WHPjyeTm8UNSc8ZG8=,tag:ODHxrPnvVYyp7aXIqLgJ2A==,type:bool]
-        sensitive: ENC[AES256_GCM,data:bwosdx0=,iv:LQE19uLEvtPN1gcaMv0IK+qKXh15BHTRFmH12tqFh54=,tag:/WA3sFgT7qVoeD3W40Yo/w==,type:bool]
+        enabled: ENC[AES256_GCM,data:MGZuTQ==,iv:aKaNLzu5u85pTA1fEVhNNC+skY5STG4uwqu/qOXpBHs=,tag:wI1S85xGwDTxF3z0WuZo3A==,type:bool]
+        sensitive: ENC[AES256_GCM,data:jN9iuDc=,iv:MInp5d8HxdtBVFcHj8hZJsQ2ZSBCXcFHsOsUTdjiwS0=,tag:aqP/zu6x2mGJnHbpqL/Wwg==,type:bool]
        remove: []
        entries:
            config.json:
-                data: ENC[AES256_GCM,data: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,iv:JSQMyeKWfdck8c/qOnMpzQlGYo0Vuar6ix5s8xBPib8=,tag:FA5LBh5K7jeU1KCjkygoYA==,type:str]
+                data: ENC[AES256_GCM,data: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,iv:o+pe+QJV3/I9zp+no4J/4DSwLMV94kdO0hejlzP7BCM=,tag:v357TJrfiGqBOnb623f69A==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -15,23 +15,23 @@ sops:
        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyV0JudFpLbFNvWC85UUZP
-            WjBHMDRDNk1tUWxnN2p5Q2dSVlZ4UkIvalJJCkVhRGhwR0tOSE9FdkZrZkdQb1JT
-            WHJ0b1NBY3FwMy9SREJ0STlxejhrTTgKLS0tIHdVWWNublVaaThDbDExRWhkTkto
-            NW0vcStOWU5JMmF1YURIbDRHTVJxNjAKbJ7gmwPy3s81LnoW7EQvo11Fd5y6Smgg
-            +tFYnp6nI/Y18IADCeRcaOqLhpdsqy4sKFwTQnXdoPl3ATq1Pn0kFQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwSmdRcDhsQjBVU2pLeFA1
+            T0NWOERjOGlEYVA0L1NlUHhNNVdGL1VUZ1JjCkt2SGI1RTdvelYwR05oS2NuOTZS
+            MmQwS05vM3FpYlVoY3J5M3lFc2Q0TDQKLS0tIHk0aE9OcmVCS3hmclhFaE9QcWNv
+            YXdncncvY2Zrd1hNN2NZWkJ1Ulk0TEUKW+jiWWs8bENOhGdmD6k+YthdOG1qdXZD
+            asj3j4Tyo5Z2fjcP5il1smsHsn2ieZNdQR4kvf6eW2NQEc8gFHLbLw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dVMyMkFwTElWaVlaNXVE
-            bm5rSTg0UFM3OVdYY1NNWEFROG4yWXdWdEVVCitoRnFmZ25UaWtMaGZhRnJMNFR0
-            c2dBUUF4QVMyQjNHT01oeEl0NHFKeDQKLS0tIHg1ZEZCRll3SjJhSW9yRlhEQjM1
-            UkRXSStaV3p4T2U5OWl5bS9PTlBObm8KMnfb2tv01U16Rhu8dzqjY7TR0IZL4E4X
-            Ov3C/6PC+UIku97bK7epMmQSPQPAyXIuXe8I/IS2QfHZsHWX7Y42JQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWWmxBWUdJM0pYRGNQTHBj
+            RHM5Vk5DczJVNUYyZG1VWUozbzRkcGtaeVI0CmN6WnVtUDNYRFdweEtSRTZkb1lj
+            S2tlWlRvSmVNNGxXUnlYa2NsVmczY2MKLS0tIGkyZWFQSDhFYXByZmJTMi9uUlB4
+            WTl6OFhRS0RvS2dCS003UjlTd3MvbVEKl1vnMX7Y06yfUOr93cfbKE1s9yboMx5j
+            Q59+vJToCCMHvCvh4v80D/sClnYpzXrwYtHei4ePO/L6D10p8awfdg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-12T14:56:01Z"
-    mac: ENC[AES256_GCM,data:zKeC8MN5ephb4RypyIvz8Q4xaIwk+YzslCujQ3xJ4aY3atrcBuYKgVJF+svL4mcFzOe7t1oy/cRCcPAqOOsxetT/Sx5Gik9EKiHpdr5O3qplgIbPeBhQXSvEaw6gc2EUs+TnRgsE3xg6bjuSOEy4+PLoIAmZ4iVMdCE5kTyA+0I=,iv:H2h/bLJasPdDkLKaiYgg7mhUxtwNHxsLyDcNOdgojOE=,tag:1YgLVZjrIHABgat4ph5MzA==,type:str]
+    lastmodified: "2024-12-12T16:36:29Z"
+    mac: ENC[AES256_GCM,data:7hv741ZDUAUP+cb+bTneOpsf74BPQ64zDH65XAK8Y/uBKn+uOIvy36A/56+XKs3Tx+53MTI09dfFI3X1gKVlsHwEtUFkx1huHSXaeTgijOxoUts43bx65HxyTbOej3vQK1TNyGQiih+U+4JnRlePy5FP8moiAOOpFUFCY9/xovk=,iv:FkFvLlB2iNhKNEUKav/pCobWrVArgzRVEFJxgVkuXiw=,tag:HbL7iW9prS/LCvbuwB9eyQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.9.2
--- a/values/badhouseplants/secrets.velero.yaml
+++ b/values/badhouseplants/secrets.velero.yaml
@ -1,25 +1,26 @@
 credentials:
-  useSecret: ENC[AES256_GCM,data:0MmoGA==,iv:5JH+WACPOYjYX5zd7HSRILMf2fnzYVTV3CrRQmnzS3Q=,tag:LimgSe1UfQOGLxzT4FMC6g==,type:bool]
-  name: ENC[AES256_GCM,data:AFewGIKXXnGErcA5KUN6,iv:vbICaeY0dB+pwKPjKgHNUWVTc1dMsjQIWaHCkTEzQm8=,tag:eHbWbam4BPnhZQRNoz7KRQ==,type:str]
-  secretContents:
-    data: ENC[AES256_GCM,data:uKF7+MPKh2vRGOxVHk9O3e5gjaV7/6RgJXa018pARGM2a5KknPTwgbRr0iatG2losd/vtmcFXDb1QJ6HFoktPd+UYqmlvRz64P8i6R6mmgiR9WI=,iv:kuG1X+1siz1X7DvzaJw6z8jJHxN5ZOvmCOqmkklMI1o=,tag:9DcebfcVD12tFGeKFNAYyQ==,type:str]
+    useSecret: ENC[AES256_GCM,data:YMinfw==,iv:+Qq/IPuOB9dy0fodE2wN34MGCOT1fG+jepnF4VeqFVU=,tag:Ppa2fDe+U8wPdoUiAc5WEw==,type:bool]
+    name: ENC[AES256_GCM,data:NjoOMcyyQFu+IEYlMenp,iv:IPYaDEk3961dghv0YaS9KL01J2L8xO3GDyf5+KwN6JI=,tag:muNgQF0a2w9+gFtbkcNx2A==,type:str]
+    secretContents:
+        data: ENC[AES256_GCM,data:VNP0AqRTmZueuVMRlEm/fRTM9nGDHTnhq4Q+NwFuuUU7JUPR2VGexvPSocxp7ttkX4TdDmWfA99Rp5Dfy8NfkX7LbYjf31RUvemQhPOJV5SIa8BnU4q/dYIiB8+4ZCEb5IDiTodEnOihOBmgMo24NA==,iv:g2C8qsylw+g9zuX1D6XKWvnYePjErswWXZ4NXx5bDBk=,tag:qSBCNL03919w4f6ki1CPpw==,type:str]
+        etersoft: ENC[AES256_GCM,data:o7Amke1w2ZGOL5bfvCzksawCB5lxjdhx9+E7goR4M5xn1JhWR1cqfrFOzciA4iAkii5LAqp5czWPqy5v+mJw8XrQxgJwLtxy2SMgk431p1x3RX0=,iv:QJ9Sl/j5/N5T4HL1kk9hle8bhe89w4GOdG88Ay8f+Ag=,tag:jzqX2xi77NZg1oY3jTRGZw==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhUnBqKzNmWDlDUVRwN0xL
-        Nm0vcG05YjI1SCs5VURiNGhUZWlPSStrNkZZCkxtU2g5WGRYdUNzeHNrazdHbVdi
-        eDB2ZVhVSkxhRzhFNHJTYURjM0ZhWXMKLS0tIG5RQk8wZWNYTExKYW9LS1ZFV0Qz
-        cGZ0c1hRalE4TXVQeWRLcDBFVkVsamMKhe9OHXaRCCHOq08gh4ynqTC0gfzVM3tP
-        +uXTkCrC4BLhm2f3xhfBwSeAQuF3eufHFC93mE1/dhz2eA91ltRZjQ==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-14T08:08:22Z"
-  mac: ENC[AES256_GCM,data:pcI5iUhUvs2gkZe+dh/BBqoKazRLG0JLfPdFwLRM6iM0Koi/TaRuETYhK+/U3UsMr/zLten8jhBpXR+6YwX359VFqKhBitBaTVcqXmMf9mEBArPtGQAql3HbnnCAt8vkW1sswc3MfWSS4MQAp5w6W+CxxAblWHQxsYWMS+VOAJw=,iv:VI5FZuAYqsNnUboGEu9dkVjzu9w1wEA/UX+nqDqFSlg=,tag:2XtEEud3+ykIq55/m2jMqg==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFV1NySnlkTjZ6clBITGZy
+            NFN1SktjY1M1TFMzclhUUjU4ZWRFNjg0WGh3Cm1uS1JpV0lYT3RmWDlHU2RnTGI2
+            VE02Tk8yWVhaRzNtMTJXaXlXWXNvT0UKLS0tIFBhR2kwNXUwaFdDVEdnZExFODhD
+            WHBOeWhvRUM1bUM4N3VVMEs0ejh0K1kK4eMGjbd5lrMXXwztGH5SIKK/oHeRV9DA
+            hh191ORRBwbXLuEDZpeB4D8jVGRBIZw/6ebPkOp9e3NHa7DjXwGbHw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-12-16T09:02:52Z"
+    mac: ENC[AES256_GCM,data:2X3exohU6Q4wAlwtNzpZoz6y/392PllxisvJ34I/Ai54fuvqZ1xl9vnrJYZYFVArRRXKN1XK9UhydFfIzUzgIHc/w6spMr40xecqyRT6BjyLPZsHaBBZf7S60d/2eBX5CQop+2RVXvXyn6A7OTOuaCFd+VnT1JzJxePNgypw4sI=,iv:kZncxToQEiip8iW7adJTByFMCyd9u/uZOL08Nr49xfM=,tag:nymx5+L1Q4l6fMXyQ2pCZQ==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.2
--- a/values/badhouseplants/values.namespaces.yaml
+++ b/values/badhouseplants/values.namespaces.yaml
@ -1,5 +1,6 @@
 namespaces:
  - name: kyverno
+  - name: velero
  - name: observability
  - name: databases
  - name: istio-system
--- a/values/badhouseplants/values.server-xray-public-edge.yaml
+++ b/values/badhouseplants/values.server-xray-public-edge.yaml
@ -1,8 +1,20 @@
+certificate:
+  enabled: true
+  certificate:
+    - name: xray-public-edge.badhouseplants.net
+      secretName: xray-public-edge.badhouseplants.net
+      issuer:
+        kind: ClusterIssuer
+        name: badhouseplants-issuer-http01
+      dnsNames:
+        - xray-public-edge.badhouseplants.net
+        - 195.201.249.91
+
 traefik:
  enabled: true
  tcpRoutes:
    - name: server-xray-public-edge
-      service: server-xray-public-xray-https
+      service: server-xray-public-edge-xray-https
      match: HostSNI(`*`)
      entrypoint: xray-edge
      port: 443
@ -12,13 +24,10 @@ ingress:
  main:
    enabled: true
    annotations:
-      cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
      kubernetes.io/ingress.allow-http: "false"
      kubernetes.io/ingress.class: traefik
      kubernetes.io/ingress.global-static-ip-name: ""
      kubernetes.io/tls-acme: "true"
-      meta.helm.sh/release-name: xray
-      meta.helm.sh/release-namespace: xray
      traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
 extraVolumes:
  certs:
--- a/values/badhouseplants/values.server-xray-public.yaml
+++ b/values/badhouseplants/values.server-xray-public.yaml
@ -9,6 +9,7 @@ certificate:
      dnsNames:
        - xray-public-dyn.badhouseplants.net
        - xray-public.badhouseplants.net
+        - 195.201.249.91

 traefik:
  enabled: true
--- a/values/badhouseplants/values.team-fortress-2.yaml
+++ b/values/badhouseplants/values.team-fortress-2.yaml
@ -30,10 +30,7 @@ traefik:

 storage:
  data:
-    storageClassName: local-path
-    size: 19G
-    annotations:
-      volume.kubernetes.io/selected-node: bordeaux
+    size: 16G

 env:
  environment:
--- a/values/badhouseplants/values.velero.yaml
+++ b/values/badhouseplants/values.velero.yaml
@ -1,28 +1,46 @@
 initContainers:
  - name: velero-plugin-for-aws
-    image: velero/velero-plugin-for-aws:v1.7.0
+    image: velero/velero-plugin-for-aws:v1.11.0
    imagePullPolicy: IfNotPresent
    volumeMounts:
      - mountPath: /target
        name: plugins
 configuration:
-  features: EnableCSI
+  logLevel: error
  backupStorageLocation:
    - name: default
      provider: aws
-      plugin: velero/velero-plugin-for-aws:v1.2.1
-      bucket: velero
+      plugin: velero/velero-plugin-for-aws:v1.11.0
+      bucket: badhouseplants-backups
      accessMode: ReadWrite
      credential:
        name: velero-s3-creds
        key: data
      config:
-        region: us-east-1
+        region: nbg1
        s3ForcePathStyle: true
-        s3Url: https://s3.e.badhouseplants.net:443
-        publicUrl: https://s3.e.badhouseplants.net:443
+        s3Url: https://nbg1.your-objectstorage.com
+        publicUrl: https://nbg1.your-objectstorage.com
+        checksumAlgorithm: ""
+    - name: etersoft
+      provider: aws
+      plugin: velero/velero-plugin-for-aws:v1.11.0
+      bucket: velero
+      accessMode: ReadWrite
+      credential:
+        name: velero-s3-creds
+        key: etersoft
+      config:
+        region: us-east1
+        s3ForcePathStyle: true
+        s3Url: https://s3e.badhouseplants.net
+        publicUrl: https://s3e.badhouseplants.net
  volumeSnapshotLocation:
-    - name: aws
+    - name: default
+      provider: aws
+      config:
+        region: nbg1
+    - name: etersoft
      provider: aws
      config:
        region: us-east-1
@ -32,6 +50,7 @@ schedules:
    disabled: false
    labels:
      backups: daily
+      storage: hetzner
    schedule: "0 0 * * *"
    useOwnerReferencesInBackup: true
    paused: false
@ -48,6 +67,7 @@ schedules:
    disabled: false
    labels:
      backups: weekly
+      storage: hetzner
    schedule: "0 1 * * 0"
    useOwnerReferencesInBackup: true
    paused: false
@ -60,10 +80,11 @@ schedules:
        - applications
        - games
        - databases
-  montly:
+  monthly:
    disabled: false
    labels:
      backups: monthly
+      storage: hetzner
    schedule: "0 3 1 * *"
    useOwnerReferencesInBackup: true
    paused: false
@ -80,6 +101,7 @@ schedules:
    disabled: false
    labels:
      backups: regular
+      storage: hetzner
    schedule: "0 */3 * * *"
    useOwnerReferencesInBackup: true
    paused: false
@ -92,3 +114,22 @@ schedules:
        - applications
        - games
        - databases
+  offsite-weekly:
+    disabled: false
+    labels:
+      backups: regular
+      storage: etersoft
+    schedule: "0 2 * * 1"
+    useOwnerReferencesInBackup: true
+    paused: false
+    template:
+      defaultVolumesToFsBackup: true
+      ttl: "1344h"
+      includedNamespaces:
+        - platform
+        - applications
+        - games
+        - databases
+      storageLocation: etersoft
+      volumeSnapshotLocations:
+        - etersoft
--- a/values/etersoft/secrets.minio.yaml
+++ b/values/etersoft/secrets.minio.yaml
@ -1,38 +1,38 @@
-rootPassword: ENC[AES256_GCM,data:vU0zmO5OP3Jl9ghspbna0qGfxcQTIXq8hg==,iv:MOstbypO5Fjaq8Ij5G9uZ/t16sUfXIz9yY8zPx6NKAE=,tag:DaCG0HLK+vn3gnrtP2+JYg==,type:str]
+rootPassword: ENC[AES256_GCM,data:btF9/FtQLpalONXSRhY8/HC4gq8vnuaaHw==,iv:K48dhNKPsqwaqvR0z+7sFdlKt56aa85z7NeSvd5KxVk=,tag:Okg6vpyaxpDFuF0sGuGthA==,type:str]
 users:
-  - accessKey: ENC[AES256_GCM,data:JO6q6GX2ykc=,iv:w+DUGbaDO2B4cq0mPfd9cRTb+mksCUFN6NnzIiy1/XI=,tag:5ek5vvSzr3kWap1Xb2GLGg==,type:str]
-    secretKey: ENC[AES256_GCM,data:OUkTOob4sKEP3JoYopE7mEQfDIHWriqCfw==,iv:qfR/iE1Z7Rq1H4sIQ86+QLdcYBIO9eMGj+a5WhSAZ80=,tag:mQKsdDVfQd3ddSxR1DImsA==,type:str]
-    policy: ENC[AES256_GCM,data:YHP1l+0yRNc=,iv:56HOoQnFknLx15Cs70QOLzi8BxUctZMby51+/cVGqX4=,tag:pZEUovYQ/H+VN2zCFCcqhw==,type:str]
-  - accessKey: ENC[AES256_GCM,data:Rp0qfNek,iv:F5DnYAtnOceF0SybkNwD+kvCpeSp84iPHyyDFr4OKEM=,tag:ZNhC7nHHPSc45iaN7lRl3g==,type:str]
-    secretKey: ENC[AES256_GCM,data:UVfxJaayD087KZUSYtlwOLXSqknSdJ8jgw==,iv:CQoU55CLi/xfyVmbUSXgwYCt5Tz6en53gOc2l+lqpmI=,tag:g6kp+RIi4gSU5efcowElPg==,type:str]
-    policy: ENC[AES256_GCM,data:KZ5i8lna,iv:pKvuyP98Gw5/cEyMsLQ4asTX5iVqvx14DqqyL/de7Qs=,tag:tnk0hQ0nOUyYWqFq7S3P1w==,type:str]
+    - accessKey: ENC[AES256_GCM,data:VU3XYBaFgnM=,iv:f8ph1DPZWHGQtfqgTby/P/ul7esiOaaUao4pjdxbW6w=,tag:MEpgtL5guJLdvELP+dUljQ==,type:str]
+      secretKey: ENC[AES256_GCM,data:rKH1j/NxhMtpPl5ugHftlAim4ZxWK2oCsQ==,iv:Dc3HGHyFzqwwBb2wau0H0Hu1d2cepckdp3O8AEsJ4xo=,tag:MXVe8mP/iAAxHV1yXReb6Q==,type:str]
+      policy: ENC[AES256_GCM,data:MjyZxYF52hw=,iv:xEb55FQfwZGa0ye9kvEqcXRD8lYojprnhiy3yZ+4ldA=,tag:cwo0RUXdS+ECYBHEqPs4tA==,type:str]
+    - accessKey: ENC[AES256_GCM,data:OgGOUoRh,iv:dznjmOZxw2YpCkyjfX61XkpRYk8sRq/vFsm2Vj2NUv4=,tag:3dZTLCRu7tLNfLxuGmuuGw==,type:str]
+      secretKey: ENC[AES256_GCM,data:GlUxSIQMcUNqrj6ucgqnfIzp73DtEN0Ihg==,iv:HpSmvfE0Nml3rlTVtZUnfCNEK9L6yjnwBoxMArZiraQ=,tag:vNJr62ntsRu9muSav0TXug==,type:str]
+      policy: ENC[AES256_GCM,data:aqDFdoy0,iv:nPNxbT0jwpTXDjs0hXgt5clFstAjbgqO6IH+Dnox/+Q=,tag:P/m0PHwZcqaF5QYQrD4oMQ==,type:str]
 oidc:
-  enabled: ENC[AES256_GCM,data:eRgTwg==,iv:B6FOHTR6zCLhurd8XfEwKZxUoed88Dfg5uCcRYCrdAQ=,tag:9sv+V9jMqFlrbymSnd190g==,type:bool]
-  configUrl: ENC[AES256_GCM,data:2okf8YvqC2GFxA1Qmd4QkvsKUCXM3mO3Rgo77cr0fgALkRlSPHvF2HyvV0oXptn38hlZ6X3aIUzBvQBCXTUeDEtBSChMCQesjMc6G0CEICfhpVaf3ddsIB12Z3VtkgQdj5U=,iv:vk1a878wLlvgNVNfVe1wr13DxNL6FNLLz/QkFsPCPJk=,tag:SE+v3ZAs9g+d/PoX+8a3ig==,type:str]
-  clientId: ENC[AES256_GCM,data:TZWnWHTSvyKmnGVd+Ps=,iv:pnTu+4L7lXo03ugt75uIbj2kd/bLf4ZUHIWCkPZPmEQ=,tag:91ZAT3tHaUiENE2pVRGvHg==,type:str]
-  clientSecret: ENC[AES256_GCM,data:t5MSbnQc8Tw3XN+vdk6SkVmfOB8fhTtiyVfdB3Gll29jSadsySUKC5knpwEHVyAId43lFYUNdf5+a2PDhSyrQcDZTK4yPh4Esop6DFHwauKiSZGRWfvF55lj9oK1l9wcsZB4lcTBOLTW68wL0vnKcVYO4KVUaBb6e5R1flckMBc=,iv:1rW7pkQaZRuXrc2eGJi/2Sj9AEOpaxHCsf5d1omSd7I=,tag:ATi+7VGLDWcGA3TLLDURkA==,type:str]
-  claimName: ENC[AES256_GCM,data:j216kTHX,iv:a8WophteKTg8W6xKC6h9C5Cu1w2Ocb8igbbQrtMowDw=,tag:AjiAO9EGqFqwoXpWiqjSjw==,type:str]
-  redirectUri: ENC[AES256_GCM,data:K8aoqUxtWtmAjgdwlpRGbsxhdVjIuY2GEvsWYAws0XtR8TVZATiCv3UejWXkr6A=,iv:jClqqipxJWrsmPwrNF7XqXbehzQCju6ZvTWm1lOg23A=,tag:wiG6xZl44j1q6oHenE3Sug==,type:str]
-  comment: ENC[AES256_GCM,data:PDvxtwyZxDO9c4ZQ9PyoTN4+mrU=,iv:YuarYR5LAkJWfDlbjdfMS/rmnmZ72H1TQl+ki1BGl1M=,tag:QFIoMaKQcxYN1mWjkdZstw==,type:str]
-  claimPrefix: ""
-  scopes: ENC[AES256_GCM,data:2sSuylsNbRbiLcgyLXWdGs3ilbd1T9iG+9zc,iv:Jg3Kkzk1S8DPork5+VL0774fyzxxGQRV38kgKxX7Ga4=,tag:gQR0ckrdADrazudjHnwmoA==,type:str]
+    enabled: ENC[AES256_GCM,data:nxzzAQ==,iv:HTVeFQPTr0HUPBi9LDfRo5qVUv8XQsBnYqvFt8cKfuQ=,tag:ARZttgS1YwYW1QjIAtbJUQ==,type:bool]
+    configUrl: ENC[AES256_GCM,data:ZgPxRfSLkCtsFTq+MrZqm5ysRkAA8YemJsaxWl6WtRbnLnJZBQqBzx7qy5ZMFP4R4Z0+7JLg243gRS/PCyDWq3NJfmM4PasDe1WxAXWJHrp+lxcN7GOM5VHcsdCi5j6KDBg=,iv:/scg0KqjnngbpqBOPvl/T8wVKTZHcWsaYOi+M9YXsUg=,tag:HdSLxvw6+vGUxgOFUETLDw==,type:str]
+    clientId: ENC[AES256_GCM,data:EORYGlAJ6EFzOQCOKMw=,iv:XVhCaWaN65vFMEcSprkWKcciHbhZoCUz5PfWn4NNwo0=,tag:YDen+LDU8H0M8omnlvk0jw==,type:str]
+    clientSecret: ENC[AES256_GCM,data:O5mJ+uxo18o04LHjY31eVs2wzJePtEXoJxXn81NBcTs0GApVPciDfUPI4mZVXskBScqT9x9ZdgkTjD44gBMzqwBjmwHEeZfPD996uSKSu2soMELLDO+D1Vp/cNjSHnUx5VKgKWxcdSxQ2WN6kxRxgCDLk9B/Cpc+pRDFiR/w46c=,iv:yjg7NUiDxjXkeQu7gpxqaZ2oGOXCpEnN5OUowlbhSPc=,tag:2o80ngR33KLxVAAehON2EQ==,type:str]
+    claimName: ENC[AES256_GCM,data:0uU9ynkc,iv:e+0Bw9bEvr++OU8Gql0m16BRE+FwsiK9vkTjdLQXsGw=,tag:Sm/kP6a+tRHYj2cnvZf3+w==,type:str]
+    redirectUri: ENC[AES256_GCM,data:AMtRfHzCg4pUM2m7enLzMOgV+oVecMarndU99YTjZP1NqTlG6Dmo6beo3/FAQI4=,iv:0SuKeW6SoAuwnGLCWz6yUI7NSxlFz4P+QTA9IP5Dokc=,tag:Vp8pVYr72MfnZYKqD0o9Bg==,type:str]
+    comment: ENC[AES256_GCM,data:QTHyj0dXt/N2ZMyv1rQyN1fUjuc=,iv:hxTK/rs1UL1n7v/2CBkHvEFZzlGZLyDv9nBmVVO+X10=,tag:haa6Hfk7pnhmCNZDWPkt9A==,type:str]
+    claimPrefix: ""
+    scopes: ENC[AES256_GCM,data:AENnoV/sNnYY/94ZTF8sbSowJn4rA1KQ4/NL,iv:+Aj93Y0j/irIfd7HsuM4n40BFwZx7zhIi5ccowLaaBY=,tag:PcT6Ywl/nnCp2bKEwsjUBg==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMdmU0Z3lNVWhiUkxwcnBS
-        T0x3alIxS29BL3JFeXZUWjZ6N0oraThuWWk4CnNQMWNQeWI1d21yWjl2cy9SaHJo
-        UHE4VS9qNVJzeHc2WjAzUm5RU29DQ3MKLS0tIHlDSXppajNkMnRGYmZvNDgwNm1p
-        dXRxNUVuTFl0SnpyOWpOcEorOEI5dm8KNQEW7Vj5rmCorzZT1Ha55h12zdAOfpBc
-        OSc3+7R34U6JFvv00StnMwgSyzq2cHolNicwDyycGoHpPf3BxVSYdA==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-16T16:50:08Z"
-  mac: ENC[AES256_GCM,data:Vr+ktFIhFszFVJvoRzqzzzrgyxSCqc48Pkm1ZnYSP8E1DNoJ3Vfvub4Z8IbD1VtSjL5r5LVLha6u+dGLIuVpzTY6c8MhmswVhD+XzGfaedutj7po+SGGyw4ZNmGgJ0hlUULM4/7dCwB47SVtv8IvDos1ZVPz40L8W3sAh4fF8Ns=,iv:MuLfFd+jI0dq2192Sipp4cAmUFeyfF4dr7Chm300UYg=,tag:Udsoo5T6nPcrPDJpq/7wtQ==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSXNKMVQySmJ5U0VMY09L
+            YklMNC9HZ3Jqb29Qa3Y0d3JJK3pqNHZEempzCkpkTnV4bHB2OU9rUExDNjFqdmkr
+            am1LNG1zdFJBb1VLS0xhR0xwOWN1QXMKLS0tIFFZcXpiTUpZbm1sRUxMYVJva0w4
+            RkhEbVRkLzZnWCtjVDYvNVVaRlpmRlEKQEq0OqdXuW56zNKrA2by3y2JfUnlIAV/
+            dIjedNebsu3E/lIAZdo+gsjrzGIZSgIxjfKoqlVP6J16aJnka8iROw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-12-15T18:54:09Z"
+    mac: ENC[AES256_GCM,data:CRYlt6HYTH/HhRT46pME5IJ0xU+oHj84AFGvSn6nPLLKAkh6sTzDqG+6/t3MZ42SUtYa77rc2dVQ47RnkIyqCWNy5PBYCS4MVuOD9nuy1YdLhQn9QCExFO2b3BgW8tRKRuEJw2tcpk6W/aoy8qh3NddMAZAAWhMLoLENnLGiMVk=,iv:JthKqEKMTsZObMQFQYBn1KFTJUmASXWdKV19IoMzvWY=,tag:N+3lEu+8hr3TUwbo5VlFrA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.2
--- a/values/etersoft/secrets.server-xray-public-bridge.yaml
+++ b/values/etersoft/secrets.server-xray-public-bridge.yaml
--- a/values/etersoft/values.minio.yaml
+++ b/values/etersoft/values.minio.yaml
@ -9,11 +9,11 @@ ingress:
    traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
  path: /
  hosts:
-    - s3.e.badhouseplants.net
+    - s3e.badhouseplants.net
  tls:
-    - secretName: s3.e.badhouseplants.net
+    - secretName: s3e.badhouseplants.net
      hosts:
-        - s3.e.badhouseplants.net
+        - s3e.badhouseplants.net
 consoleIngress:
  enabled: true
  ingressClassName: traefik
@ -34,7 +34,7 @@ rootUser: 'overlord'
 replicas: 1
 mode: standalone
 environment:
-  MINIO_SERVER_URL: "https://s3.e.badhouseplants.net:443"
+  MINIO_SERVER_URL: "https://s3e.badhouseplants.net"
 tls:
  enabled: false
  certSecret: ''
@ -46,7 +46,7 @@ persistence:
  storageClass: local-path
  enabled: true
  accessMode: ReadWriteOnce
-  size: 40Gi
+  size: 60Gi
 service:
  type: ClusterIP
  clusterIP: ~
--- a/values/etersoft/values.server-xray-public-bridge.yaml
+++ b/values/etersoft/values.server-xray-public-bridge.yaml
@ -0,0 +1,39 @@
+certificate:
+  enabled: true
+  certificate:
+    - name: xray-public-bridge.e.badhouseplants.net
+      secretName: xray-public-bridge.e.badhouseplants.net
+      issuer:
+        kind: ClusterIssuer
+        name: badhouseplants-issuer-http01
+      dnsNames:
+        - xray-public-bridge.e.badhouseplants.net
+        - 91.232.225.63
+
+traefik:
+  enabled: true
+  tcpRoutes:
+    - name: server-xray-public-bridge
+      service: server-xray-public-bridge-xray-https
+      match: HostSNI(`*`)
+      entrypoint: xray-edge
+      port: 443
+shortcuts:
+  hostname: xray-public-bridge.e.badhouseplants.net
+ingress:
+  main:
+    enabled: true
+    annotations:
+      kubernetes.io/ingress.allow-http: "false"
+      kubernetes.io/ingress.class: traefik
+      kubernetes.io/ingress.global-static-ip-name: ""
+      kubernetes.io/tls-acme: "true"
+      meta.helm.sh/release-name: xray
+      meta.helm.sh/release-namespace: xray
+      traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+extraVolumes:
+  certs:
+    secret:
+      secretName: xray-public-bridge.e.badhouseplants.net
+workload:
+  replicas: 1
--- a/values/etersoft/values.traefik.yaml
+++ b/values/etersoft/values.traefik.yaml
@ -5,3 +5,13 @@ ports:
      default: true
    exposedPort: 1194
    protocol: TCP
+  xray:
+    port: 27015
+    expose:
+      default: true
+    exposedPort: 27015
+    protocol: TCP
+providers: # @schema additionalProperties: false
+  kubernetesCRD:
+    enabled: true
+    allowExternalNameServices: true