Merge pull request #475 from jumpstarter-dev/backport-474-to-release-0.6

Author: mangelajo

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/install.py

@@ -3,7 +3,9 @@
 import asyncclick as click
 from jumpstarter_cli_common.opt import opt_context, opt_kubeconfig
 from jumpstarter_cli_common.version import get_client_version
-from jumpstarter_kubernetes import get_ip_address, helm_installed, install_helm_chart
+from jumpstarter_kubernetes import helm_installed, install_helm_chart
+
+from jumpstarter.common.ipaddr import get_ip_address
 
 
 def get_chart_version() -> str:

packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py

@@ -6,6 +6,7 @@
 from aiohttp import web
 from jumpstarter_driver_opendal.driver import Opendal
 
+from jumpstarter.common.ipaddr import get_ip_address
 from jumpstarter.driver import Driver, export
 
 
@@ -41,18 +42,7 @@ def __post_init__(self):
             ]
         )
         if self.host is None:
-            self.host = self.get_default_ip()
-
-    def get_default_ip(self):
-        try:
-            import socket
-
-            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-                s.connect(("8.8.8.8", 80))
-                return s.getsockname()[0]
-        except Exception:
-            self.logger.warning("Could not determine default IP address, falling back to 0.0.0.0")
-            return "0.0.0.0"
+            self.host = get_ip_address(logger=self.logger)
 
     @classmethod
     def client(cls) -> str:

packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py

@@ -1,6 +1,5 @@
 import asyncio
 import os
-import socket
 import threading
 from dataclasses import dataclass, field
 from typing import Optional
@@ -9,6 +8,7 @@
 
 from jumpstarter_driver_tftp.server import TftpServer
 
+from jumpstarter.common.ipaddr import get_ip_address
 from jumpstarter.driver import Driver, export
 
 
@@ -55,17 +55,7 @@ def __post_init__(self):
         self.storage = self.children["storage"]
 
         if self.host == "":
-            self.host = self.get_default_ip()
-
-    def get_default_ip(self):
-        """Get the IP address of the default route interface"""
-        try:
-            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-                s.connect(("8.8.8.8", 80))
-                return s.getsockname()[0]
-        except Exception:
-            self.logger.warning("Could not determine default IP address, falling back to 0.0.0.0")
-            return "0.0.0.0"
+            self.host = get_ip_address(logger=self.logger)
 
     @classmethod
     def client(cls) -> str:

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/__init__.py

@@ -6,7 +6,7 @@
     V1Alpha1ExporterList,
     V1Alpha1ExporterStatus,
 )
-from .install import get_ip_address, helm_installed, install_helm_chart
+from .install import helm_installed, install_helm_chart
 from .leases import (
     LeasesV1Alpha1Api,
     V1Alpha1Lease,
@@ -34,7 +34,6 @@
     "V1Alpha1LeaseSelector",
     "V1Alpha1LeaseSpec",
     "V1Alpha1List",
-    "get_ip_address",
     "helm_installed",
     "install_helm_chart",
 ]

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/install.py

@@ -1,22 +1,8 @@
 import asyncio
 import shutil
-import socket
 from typing import Literal, Optional
 
 
-def get_ip_address() -> str:
-    """Get the IP address of the host machine"""
-    # Try to get the IP address using the hostname
-    hostname = socket.gethostname()
-    address = socket.gethostbyname(hostname)
-    # If it returns a bogus address, do it the hard way
-    if not address or address.startswith("127."):
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.connect(("1.1.1.1", 0))
-        address = s.getsockname()[0]
-    return address
-
-
 def helm_installed(name: str) -> bool:
     return shutil.which(name) is not None
 

packages/jumpstarter/jumpstarter/common/ipaddr.py

@@ -0,0 +1,22 @@
+import logging
+import socket
+from ipaddress import ip_address
+
+
+def get_ip_address(logger: logging.Logger | None = None) -> str:
+    """Get the IP address of the host machine"""
+    # Try to get the IP address using the hostname
+    hostname = socket.gethostname()
+    address = socket.gethostbyname(hostname)
+    # If it returns nothing or a loopbadck address, do it the hard way
+    if not address or ip_address(address).is_loopback:
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+                s.connect(("192.175.48.1", 53))  # AS112
+                return s.getsockname()[0]
+        except Exception:
+            if logger:
+                logger.warning("Could not determine default IP address, falling back to 0.0.0.0")
+            return "0.0.0.0"
+
+    return address