refactor: replace wiremind_kubernetes with local helpers (ch-32z)

pyproject.toml

@@ -16,10 +16,10 @@ classifiers = [
 
 dependencies = [
   "alembic",
+  "kubernetes",
   "psycopg2",
   "pydantic>=2.0.0",
   "PyYAML",
-  "wiremind-kubernetes~=7.0",
 ]
 
 [build-system]

requirements.txt

@@ -16,12 +16,10 @@ durationpy==0.10
     # via kubernetes
 google-auth==2.41.1
     # via kubernetes
-greenlet==3.2.4
-    # via sqlalchemy
 idna==3.10
     # via requests
 kubernetes==34.1.0
-    # via wiremind-kubernetes
+    # via chartreuse (pyproject.toml)
 mako==1.3.10
     # via alembic
 markupsafe==3.0.3
@@ -75,5 +73,3 @@ urllib3==2.3.0
     #   requests
 websocket-client==1.9.0
     # via kubernetes
-wiremind-kubernetes==7.5.0
-    # via chartreuse (pyproject.toml)

src/chartreuse/chartreuse.py

@@ -1,9 +1,8 @@
 import logging
 
-import wiremind_kubernetes.kubernetes_helper
-
 from .config_loader import DatabaseConfig
 from .utils import AlembicMigrationHelper
+from .utils.kubernetes_helper import KubernetesDeploymentManager
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +22,7 @@ def __init__(
         self,
         databases_config: dict[str, DatabaseConfig],
         release_name: str,
-        kubernetes_helper: wiremind_kubernetes.kubernetes_helper.KubernetesDeploymentManager | None = None,
+        kubernetes_helper: KubernetesDeploymentManager | None = None,
     ):
         configure_logging()
 
@@ -56,9 +55,7 @@ def __init__(
         if kubernetes_helper:
             self.kubernetes_helper = kubernetes_helper
         else:
-            self.kubernetes_helper = wiremind_kubernetes.kubernetes_helper.KubernetesDeploymentManager(
-                use_kubeconfig=None, release_name=release_name
-            )
+            self.kubernetes_helper = KubernetesDeploymentManager(use_kubeconfig=None, release_name=release_name)
 
     @property
     def is_migration_needed(self) -> bool:

src/chartreuse/chartreuse_upgrade.py

@@ -1,12 +1,11 @@
 import logging
 import os
 
-from wiremind_kubernetes import KubernetesDeploymentManager
-
 from chartreuse import get_version
 
 from .chartreuse import Chartreuse
 from .config_loader import load_multi_database_config
+from .utils.kubernetes_helper import KubernetesDeploymentManager
 
 logger = logging.getLogger(__name__)
 

src/chartreuse/tests/conftest.py

@@ -59,9 +59,8 @@ def configure_chartreuse_mock(
 
     # Mock KubernetesDeploymentManager in all the right places
     mock_kdm = mocker.MagicMock()
-    mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager", return_value=mock_kdm)
     mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager", return_value=mock_kdm)
 
     # Also mock the kubernetes config loading to prevent the config errors
     mocker.patch("kubernetes.config.load_incluster_config")
-    mocker.patch("wiremind_kubernetes.kube_config.load_kubernetes_config")
+    mocker.patch("chartreuse.utils.kubernetes_helper.load_kubernetes_config")

src/chartreuse/tests/e2e_tests/conftest.py

@@ -7,12 +7,10 @@
 import pytest
 import sqlalchemy
 from sqlalchemy import inspect
-from wiremind_kubernetes.kube_config import load_kubernetes_config
-from wiremind_kubernetes.kubernetes_helper import KubernetesDeploymentManager
-from wiremind_kubernetes.tests.e2e_tests.conftest import create_namespace, setUpE2E  # noqa: F401
-from wiremind_kubernetes.utils import run_command
 
 import chartreuse
+from chartreuse.utils.command import run_command
+from chartreuse.utils.kubernetes_helper import KubernetesDeploymentManager, load_kubernetes_config
 
 TEST_NAMESPACE = "chartreuse-e2e-test"
 TEST_RELEASE = "e2e-test-release"
@@ -26,6 +24,16 @@
 POSTGRESQL_URL = "postgresql://foo:foo@localhost/foo?sslmode=prefer"
 
 
+@pytest.fixture(scope="session")
+def create_namespace() -> Generator:
+    yield
+
+
+@pytest.fixture(scope="session")
+def setUpE2E() -> Generator:
+    yield
+
+
 def _cluster_init(include_chartreuse: bool, pre_upgrade: bool = False) -> Generator:
     # In order to configure kubernetes
     load_kubernetes_config(use_kubeconfig=None)

src/chartreuse/tests/unit_tests/conftest.py

@@ -12,6 +12,6 @@ def configure_chartreuse_mock(mocker: MockerFixture, is_migration_needed: bool =
     )
     mocker.patch("chartreuse.chartreuse_upgrade.Chartreuse.upgrade")
     mocker.patch(
-        "wiremind_kubernetes.kubernetes_helper._get_namespace_from_kube",
+        "chartreuse.utils.kubernetes_helper._get_namespace_from_kube",
         return_value="foo",
     )

src/chartreuse/tests/unit_tests/test_chartreuse.py

@@ -87,7 +87,7 @@ def test_chartreuse_init_without_kubernetes_helper(self, mocker: MockerFixture)
         mock_alembic_helper.return_value = mock_alembic_instance
 
         # Mock KubernetesDeploymentManager
-        mock_k8s_manager = mocker.patch("wiremind_kubernetes.kubernetes_helper.KubernetesDeploymentManager")
+        mock_k8s_manager = mocker.patch("chartreuse.chartreuse.KubernetesDeploymentManager")
         mock_k8s_instance = MagicMock()
         mock_k8s_manager.return_value = mock_k8s_instance
 
@@ -315,7 +315,7 @@ def test_multi_chartreuse_init_without_kubernetes_helper(self, mocker: MockerFix
         mock_alembic_helper.return_value = mock_alembic_instance
 
         # Mock KubernetesDeploymentManager
-        mock_k8s_manager = mocker.patch("wiremind_kubernetes.kubernetes_helper.KubernetesDeploymentManager")
+        mock_k8s_manager = mocker.patch("chartreuse.chartreuse.KubernetesDeploymentManager")
         mock_k8s_instance = MagicMock()
         mock_k8s_manager.return_value = mock_k8s_instance
 

src/chartreuse/tests/unit_tests/test_chartreuse_upgrade.py

@@ -14,8 +14,8 @@ def test_chartreuse_upgrade_detected_migration_enabled_stop_pods(
     Test that chartreuse_upgrades stop pods in case of detected migration.
     """
     configure_chartreuse_mock(mocker=mocker, is_migration_needed=True)
-    mocked_stop_pods = mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.stop_pods")
-    mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.start_pods")
+    mocked_stop_pods = mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.stop_pods")
+    mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.start_pods")
     mocker.patch("chartreuse.chartreuse_upgrade.get_version", return_value="5.0.0")
     configure_os_environ_mock(mocker=mocker, additional_environment={"HELM_CHART_VERSION": "5.0.0"})
 
@@ -30,8 +30,8 @@ def test_chartreuse_upgrade_detected_migration_disabled_stop_pods(
     Test that chartreuse_upgrades does not stop pods in case of detected migration but we disallow stop-pods.
     """
     configure_chartreuse_mock(mocker=mocker, is_migration_needed=True)
-    mocked_stop_pods = mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.stop_pods")
-    mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.start_pods")
+    mocked_stop_pods = mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.stop_pods")
+    mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.start_pods")
     mocker.patch("chartreuse.chartreuse_upgrade.get_version", return_value="5.0.0")
     configure_os_environ_mock(
         mocker=mocker,
@@ -49,8 +49,8 @@ def test_chartreuse_upgrade_no_migration_disabled_stop_pods(
     Test that chartreuse_upgrades does NOT stop pods in case of migration not needed.
     """
     configure_chartreuse_mock(mocker=mocker, is_migration_needed=False)
-    mocked_stop_pods = mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.stop_pods")
-    mocker.patch("wiremind_kubernetes.KubernetesDeploymentManager.start_pods")
+    mocked_stop_pods = mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.stop_pods")
+    mocker.patch("chartreuse.chartreuse_upgrade.KubernetesDeploymentManager.start_pods")
     mocker.patch("chartreuse.chartreuse_upgrade.get_version", return_value="5.0.0")
     configure_os_environ_mock(mocker=mocker, additional_environment={"HELM_CHART_VERSION": "5.0.0"})
 

src/chartreuse/utils/__init__.py

@@ -1 +1,3 @@
 from .alembic_migration_helper import AlembicMigrationHelper  # noqa: F401
+from .command import run_command  # noqa: F401
+from .kubernetes_helper import KubernetesDeploymentManager, load_kubernetes_config  # noqa: F401

src/chartreuse/utils/alembic_migration_helper.py

@@ -5,7 +5,8 @@
 
 import sqlalchemy
 from sqlalchemy import inspect
-from wiremind_kubernetes.utils import run_command
+
+from .command import run_command
 
 logger = logging.getLogger(__name__)
 

src/chartreuse/utils/command.py

@@ -0,0 +1,22 @@
+import subprocess
+
+
+def run_command(
+    command: str,
+    *,
+    cwd: str | None = None,
+    return_result: bool = False,
+) -> tuple[str, str | None, int] | None:
+    result = subprocess.run(
+        command,
+        cwd=cwd,
+        shell=True,
+        check=not return_result,
+        capture_output=return_result,
+        text=True,
+    )
+
+    if return_result:
+        return result.stdout, result.stderr, result.returncode
+
+    return None