diff --git a/servers/legion/k8s/fornax/worker/base/deployment.yaml b/servers/legion/k8s/fornax/worker/base/deployment.yaml index 7ccb299..0b9bc09 100644 --- a/servers/legion/k8s/fornax/worker/base/deployment.yaml +++ b/servers/legion/k8s/fornax/worker/base/deployment.yaml @@ -63,7 +63,7 @@ spec: - NET_ADMIN env: - name: VPN_SERVICE_PROVIDER - value: custom + value: protonvpn - name: VPN_TYPE value: wireguard - name: WIREGUARD_PRIVATE_KEY @@ -71,22 +71,13 @@ spec: secretKeyRef: name: fornax-worker-WORKER_ID-secrets key: PROTONVPN_PRIVATE_KEY - - name: WIREGUARD_PUBLIC_KEY + - name: SERVER_NAMES valueFrom: secretKeyRef: name: fornax-worker-WORKER_ID-secrets - key: PROTONVPN_PUBLIC_KEY - - name: WIREGUARD_ENDPOINT_IP - valueFrom: - secretKeyRef: - name: fornax-worker-WORKER_ID-secrets - key: PROTONVPN_ENDPOINT_IP - - name: WIREGUARD_ENDPOINT_PORT - value: "51820" + key: PROTONVPN_SERVER - name: VPN_PORT_FORWARDING value: "on" - - name: VPN_PORT_FORWARDING_PROVIDER - value: protonvpn - name: FIREWALL_OUTBOUND_SUBNETS value: 10.42.0.0/16,10.43.0.0/16 ports: diff --git a/servers/legion/k8s/fornax/worker/base/externalsecret.yaml b/servers/legion/k8s/fornax/worker/base/externalsecret.yaml index 8b70173..c24fcdf 100644 --- a/servers/legion/k8s/fornax/worker/base/externalsecret.yaml +++ b/servers/legion/k8s/fornax/worker/base/externalsecret.yaml @@ -16,11 +16,7 @@ spec: remoteRef: key: secret/data/fornax/worker-WORKER_ID property: private_key - - secretKey: PROTONVPN_ENDPOINT_IP + - secretKey: PROTONVPN_SERVER remoteRef: key: secret/data/fornax/worker-WORKER_ID - property: endpoint_ip - - secretKey: PROTONVPN_PUBLIC_KEY - remoteRef: - key: secret/data/fornax/worker-WORKER_ID - property: public_key + property: server diff --git a/servers/legion/k8s/fornax/worker/overlays/worker-tx253/kustomization.yaml b/servers/legion/k8s/fornax/worker/overlays/worker-tx253/kustomization.yaml index b2efff3..081aeda 100644 --- a/servers/legion/k8s/fornax/worker/overlays/worker-tx253/kustomization.yaml +++ b/servers/legion/k8s/fornax/worker/overlays/worker-tx253/kustomization.yaml @@ -26,9 +26,6 @@ patches: - op: replace path: /spec/template/spec/containers/0/env/3/valueFrom/secretKeyRef/name value: fornax-worker-tx253-secrets - - op: replace - path: /spec/template/spec/containers/0/env/4/valueFrom/secretKeyRef/name - value: fornax-worker-tx253-secrets - op: replace path: /spec/template/spec/volumes/1/persistentVolumeClaim/claimName value: fornax-worker-tx253-config @@ -68,6 +65,3 @@ patches: - op: replace path: /spec/data/1/remoteRef/key value: secret/data/fornax/worker-tx253 - - op: replace - path: /spec/data/2/remoteRef/key - value: secret/data/fornax/worker-tx253 diff --git a/servers/legion/k8s/fornax/worker/overlays/worker-tx34/kustomization.yaml b/servers/legion/k8s/fornax/worker/overlays/worker-tx34/kustomization.yaml index 4eaf92f..319f49f 100644 --- a/servers/legion/k8s/fornax/worker/overlays/worker-tx34/kustomization.yaml +++ b/servers/legion/k8s/fornax/worker/overlays/worker-tx34/kustomization.yaml @@ -26,9 +26,6 @@ patches: - op: replace path: /spec/template/spec/containers/0/env/3/valueFrom/secretKeyRef/name value: fornax-worker-tx34-secrets - - op: replace - path: /spec/template/spec/containers/0/env/4/valueFrom/secretKeyRef/name - value: fornax-worker-tx34-secrets - op: replace path: /spec/template/spec/volumes/1/persistentVolumeClaim/claimName value: fornax-worker-tx34-config @@ -68,6 +65,3 @@ patches: - op: replace path: /spec/data/1/remoteRef/key value: secret/data/fornax/worker-tx34 - - op: replace - path: /spec/data/2/remoteRef/key - value: secret/data/fornax/worker-tx34