Skip kube_discovery setup outside the env-start phase

env test/env stop re-run the dd_environment fixture body to reach kind_run's
teardown, but KUBECONFIG isn't guaranteed to resolve to a live cluster at that
point. setup_discovery_agent()/save_kube_discovery_state() were running
unconditionally, so env stop tried to kubectl apply against a stale/empty
kubeconfig and errored (harmlessly, since kind_run's own teardown still ran,
but noisily). Gate both on set_up_env(), matching how KindUp/ComposeFileUp/
PortForwardUp already behave. Verified via a real start/test/stop cycle
against keda's kind cluster.

Environment: Datadog workspace

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Co-authored-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>

Author: vitkyrka

datadog_checks_dev/datadog_checks/dev/kube_discovery.py

@@ -23,7 +23,7 @@
 import pytest
 import yaml
 
-from ._env import e2e_testing, format_config, get_state, replay_check_run, save_state
+from ._env import e2e_testing, format_config, get_state, replay_check_run, save_state, set_up_env
 from .docker import CONTAINER_STABILITY_LOG_PATTERNS, _assert_no_log_patterns
 from .subprocess import run_command
 from .utils import find_check_root
@@ -48,7 +48,14 @@
 
 
 def save_kube_discovery_state(kubeconfig_path: str | os.PathLike[str], *, namespace: str = DISCOVERY_NAMESPACE) -> None:
-    """Persist the kubeconfig path and agent namespace from the setup process to the test process."""
+    """Persist the kubeconfig path and agent namespace from the setup process to the test process.
+
+    A no-op outside the actual environment setup pass (``env test``/``env stop`` re-run the fixture
+    body to reach ``kind_run``'s teardown, but must not re-derive or overwrite this state).
+    """
+    if not set_up_env():
+        return
+
     save_state('kube_discovery', {'kubeconfig_path': os.fspath(kubeconfig_path), 'namespace': namespace})
 
 
@@ -62,8 +69,14 @@ def setup_discovery_agent(
     """Deploy a sleeping, RBAC-scoped Agent pod that ``run_discovery_check_kubernetes`` can exec into.
 
     Call this inside the integration's existing ``kind_run(...)`` block, while ``KUBECONFIG`` still
-    points at the freshly created cluster.
+    points at the freshly created cluster. A no-op outside the actual environment setup pass, matching
+    how ``KindUp``/``ComposeFileUp``/``PortForwardUp`` behave: ``env test``/``env stop`` re-run the
+    fixture body to reach ``kind_run``'s teardown, but ``KUBECONFIG`` isn't guaranteed to resolve to a
+    live cluster at that point.
     """
+    if not set_up_env():
+        return
+
     check_root = os.fspath(check_root or find_check_root(depth=1))
     check_name = os.path.basename(check_root)
 

datadog_checks_dev/tests/test_kube_discovery.py

@@ -71,7 +71,29 @@ def test_get_kube_discovery_state_missing_raises(monkeypatch):
         _get_kube_discovery_state()
 
 
+def test_save_kube_discovery_state_is_noop_when_setup_disabled(monkeypatch):
+    monkeypatch.delenv('DDEV_E2E_ENV_kube_discovery', raising=False)
+    monkeypatch.setenv('DDEV_E2E_UP', 'false')
+
+    save_kube_discovery_state('/tmp/kubeconfig')
+
+    from datadog_checks.dev.kube_discovery import _get_kube_discovery_state
+
+    with pytest.raises(AssertionError, match='No kube_discovery state found'):
+        _get_kube_discovery_state()
+
+
 class TestSetupDiscoveryAgent:
+    def test_is_noop_when_setup_disabled(self, monkeypatch):
+        monkeypatch.setenv('DDEV_E2E_UP', 'false')
+
+        with mock.patch('datadog_checks.dev.kube_discovery.run_command') as run_command:
+            # env test/env stop re-run this fixture body to reach kind_run's teardown, but must not
+            # re-apply manifests against a KUBECONFIG that isn't guaranteed to point at a live cluster.
+            setup_discovery_agent('/tmp/kubeconfig')
+
+        run_command.assert_not_called()
+
     def test_applies_manifests_and_installs_package(self, tmp_path):
         check_root = tmp_path / 'test_check'
         _write_auto_conf(check_root)