From 55aea094b2daca77a6dbe7d2ee84b1514b5e21cc Mon Sep 17 00:00:00 2001
From: Michael Weber <mw@magneticflux.net>
Date: Tue, 2 Jun 2026 21:36:56 -0500
Subject: [PATCH] Avoid nested DevSpace DNS reset during destroy

---
 scripts/devspace-cluster-backend.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/devspace-cluster-backend.sh b/scripts/devspace-cluster-backend.sh
index 8784a56..91c9bf2 100755
--- a/scripts/devspace-cluster-backend.sh
+++ b/scripts/devspace-cluster-backend.sh
@@ -805,7 +805,6 @@ ensure_gke_external() {
 
 destroy_cluster() {
   load_devspace_vars
-  require_tool devspace
   require_tool gcloud
   require_tool kubectl
   require_tool terraform
@@ -870,7 +869,7 @@ destroy_cluster() {
   ensure_gcloud_auth "${project_id}"
 
   echo >&2 "I: Resetting host DNS integration if configured..."
-  devspace run reset-cluster-dns >/dev/null 2>&1 || true
+  reset_destroy_host_dns || true
 
   destroy_cluster_kubernetes_cleanup "${project_id}" "${region}" "${cluster_name}" "${managed_context}"
   cleanup_gke_dns_records "${project_id}" "${dns_zone}"
@@ -886,6 +885,20 @@ destroy_cluster() {
   echo >&2 "I: Managed GKE cluster destroyed."
 }
 
+reset_destroy_host_dns() {
+  case "$(uname -s)" in
+    Darwin)
+      ./scripts/cluster-dns.sh reset-darwin cloud-dns "${DNS_SERVICE_ID:-gcp-kube}" "${GKE_DNS_DOMAIN:-gcp.kube}" "${GKE_DNS_NAMESERVERS:-}" ""
+      ;;
+    Linux)
+      ./scripts/cluster-dns.sh reset-linux cloud-dns "${DNS_SERVICE_ID:-gcp-kube}" "${GKE_DNS_DOMAIN:-gcp.kube}" "${GKE_DNS_NAMESERVERS:-}" ""
+      ;;
+    *)
+      echo >&2 "I: Skipping host DNS reset on unsupported OS $(uname -s)."
+      ;;
+  esac
+}
+
 cleanup_destroyed_kube_context() {
   local context="$1"
   local current