Make version checking more flexible (#686)

Author: jacobtomlinson

kr8s/_api.py

@@ -21,6 +21,7 @@
 import httpx_ws
 from cachetools import TTLCache  # type: ignore
 from cryptography import x509
+from packaging.version import InvalidVersion
 from packaging.version import parse as parse_version
 
 from ._auth import KubeAuth
@@ -271,18 +272,32 @@ async def async_version(self) -> dict:
 
     async def _check_version(self) -> None:
         version = await self.async_version()
+        git_version = version["gitVersion"]
+
+        supported_message = (
+            f"Supported versions for kr8s {__version__} are "
+            f"{KUBERNETES_MINIMUM_SUPPORTED_VERSION}"
+            " to "
+            f"{KUBERNETES_MAXIMUM_SUPPORTED_VERSION}."
+        )
+
+        try:
+            # Remove variant suffix if present before parsing, e.g v1.32.9-eks-113cf36 -> v1.32.9
+            version = parse_version(git_version.split("-")[0])
+        except InvalidVersion:
+            warnings.warn(
+                f"Unable to parse Kubernetes version {git_version}. {supported_message}",
+                UserWarning,
+                stacklevel=2,
+            )
+            return
+
         if (
-            parse_version(version["gitVersion"]) < KUBERNETES_MINIMUM_SUPPORTED_VERSION
-            or parse_version(version["gitVersion"])
-            > KUBERNETES_MAXIMUM_SUPPORTED_VERSION
+            version < KUBERNETES_MINIMUM_SUPPORTED_VERSION
+            or version > KUBERNETES_MAXIMUM_SUPPORTED_VERSION
         ):
             warnings.warn(
-                f"Kubernetes version {version['gitVersion']} is not supported. "
-                f"Supported versions for kr8s {__version__} are "
-                f"{KUBERNETES_MINIMUM_SUPPORTED_VERSION}"
-                f" to "
-                f"{KUBERNETES_MAXIMUM_SUPPORTED_VERSION}"
-                ".",
+                f"Kubernetes version {git_version} is not supported. {supported_message}",
                 UserWarning,
                 stacklevel=2,
             )
@@ -711,8 +726,6 @@ async def create(self, resources: list[APIObject]):
 
     @property
     def __version__(self) -> str:
-        from . import __version__
-
         return f"kr8s/{__version__}"
 
     @property

kr8s/tests/test_api.py

@@ -513,11 +513,21 @@ def test_create_sync(example_pod_spec, example_service_spec):
     service.delete()
 
 
-async def test_bad_kubernetes_version():
+@pytest.mark.parametrize(
+    "version",
+    [
+        "1.27.0",
+        "v1.27.0",
+        "1.27.0-eks-113cf36",
+        "v1.27.0-eks-113cf36",
+        "asdkjhaskdjhasd",
+    ],
+)
+async def test_bad_kubernetes_version(version):
     api = await kr8s.asyncio.api()
     keep = api.async_version
-    api.async_version = AsyncMock(return_value={"gitVersion": "1.27.0"})
-    with pytest.warns(UserWarning):
+    api.async_version = AsyncMock(return_value={"gitVersion": version})
+    with pytest.warns(UserWarning, match=version):
         await api._check_version()
     api.async_version = keep