Merge pull request #416 from gefyrahq/fix/cargo-connect-2.0

fix(client): handle new WG field, presharedkey
gefyrahq · Sep 5, 2023 · e543b25 · e543b25
2 parents 4433311 + 6f40927
commit e543b25
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/client/gefyra/local/cargo.py b/client/gefyra/local/cargo.py
@@ -44,6 +44,7 @@ def create_wireguard_config(
         "[Peer]\n"
         f"PublicKey = {params.ppublickey}\n"
         f"Endpoint = {cargo_endpoint}\n"
+        f"PresharedKey = {params.presharedkey}\n"
         "PersistentKeepalive = 21\n"
         "AllowedIPs = 0.0.0.0/0\n"
     )
diff --git a/client/gefyra/misc/comps/deployment.py b/client/gefyra/misc/comps/deployment.py
@@ -41,6 +41,16 @@ def data(params: "GefyraInstallOptions") -> list[dict]:
                                 "image": f"quay.io/gefyra/operator:{params.version}",
                                 "imagePullPolicy": "Always",
                                 "ports": [{"containerPort": 9443}],
+                                "env": [
+                                    {
+                                        "name": "GEFYRA_STOWAWAY_TAG",
+                                        "value": params.version,
+                                    },
+                                    {
+                                        "name": "GEFYRA_CARRIER_IMAGE_TAG",
+                                        "value": params.version,
+                                    },
+                                ],
                             }
                         ],
                     },
@@ -81,7 +91,17 @@ def data(params: "GefyraInstallOptions") -> list[dict]:
                                 "image": f"quay.io/gefyra/operator:{params.version}",
                                 "imagePullPolicy": "Always",
                                 "ports": [{"containerPort": 9443}],
-                                "env": [{"name": "OP_MODE", "value": "webhook"}],
+                                "env": [
+                                    {"name": "OP_MODE", "value": "webhook"},
+                                    {
+                                        "name": "GEFYRA_STOWAWAY_TAG",
+                                        "value": params.version,
+                                    },
+                                    {
+                                        "name": "GEFYRA_CARRIER_IMAGE_TAG",
+                                        "value": params.version,
+                                    },
+                                ],
                                 "livenessProbe": {
                                     "exec": {
                                         "command": [

diff --git a/client/gefyra/types.py b/client/gefyra/types.py
@@ -52,8 +52,10 @@ class StowawayConfig:
     pallowedips: str
     # Peer.Endpoint: 95.91.248.4:31820
     pendpoint: str
-    # Peer.PublicKey: sy8jXi7S7rUGpqLnqgKnmHFXylqQdvCPCfhBAgSVGEM=
+    # Peer.PublicKey: sy8jXi7...=
     ppublickey: str
+    # Peer.PresharedKey: WCWY20...=
+    presharedkey: str
 
 
 class GefyraClientState(Enum):
@@ -117,6 +119,7 @@ def _init_data(self, _object: dict[str, Any]):
                 pallowedips=providerconfig.get("Peer.AllowedIPs"),
                 pendpoint=providerconfig.get("Peer.Endpoint"),
                 ppublickey=providerconfig.get("Peer.PublicKey"),
+                presharedkey=providerconfig.get("Peer.PresharedKey"),
             )
 
     def as_dict(self) -> dict[str, Any]:

diff --git a/operator/tests/e2e/conftest.py b/operator/tests/e2e/conftest.py
@@ -1,3 +1,5 @@
+import sys
+import platform
 from pathlib import Path
 import subprocess
 import pytest
@@ -7,9 +9,13 @@
 @pytest.fixture(scope="session")
 def cargo_image(request):
     name = "cargo:pytest"
+    if sys.platform == "win32" or "microsoft-standard" in platform.release():
+        target = "cargo-win"
+    else:
+        target = "cargo"
     subprocess.run(
         (
-            f"docker build -t {name} -f"
+            f"docker build --target {target} -t {name} -f"
             f" {(Path(__file__).parent / Path('../../../cargo/Dockerfile')).resolve()}"
             f" {(Path(__file__).parent / Path('../../../cargo/')).resolve()}"
         ),

diff --git a/operator/tests/e2e/utils.py b/operator/tests/e2e/utils.py
@@ -11,13 +11,9 @@
 
 
 def get_dockerfile():
-    run_patch = ""
-    if sys.platform == "win32" or "microsoft-standard" in platform.release():
-        run_patch = "RUN patch /usr/bin/wg-quick /wgquick.patch"
     return io.BytesIO(
-        f""" 
+        """ 
 FROM "cargo:pytest"
-{run_patch}
 
 ARG ADDRESS
 ARG MTU
@@ -146,8 +142,8 @@ def connect(self, configs: dict):
     def probe(self):
         cargo = self.container
         for _ in range(0, 10):
-            _r = cargo.exec_run(f"timeout 1 ping -c 1 192.168.99.1")
-            if _r.exit_code != 0:
+            _exit_code, _ = cargo.exec_run(f"timeout 1 ping -c 1 192.168.99.1")
+            if _exit_code != 0:
                 continue
             else:
                 break