From fdc8ac41b92d5529a06e757041efffbcee90c0ab Mon Sep 17 00:00:00 2001
From: "Eduardo' Vela\" Nava (sirdarckcat)" <sirdarckcat@gmail.com>
Date: Fri, 12 Sep 2025 16:00:18 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Revert=20"Revert=20"namespa?=
 =?UTF-8?q?ce=20kctf=20zones=20by=20cluster=20name=20(#381)"=20=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 687b70f6c40a1d0f4ddaee12404b9319707c3b7a.
---
 dist/bin/kctf-cluster                   |  2 +-
 kctf-operator/resources/external-dns.go | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dist/bin/kctf-cluster b/dist/bin/kctf-cluster
index f6510c3f..ab05d30c 100755
--- a/dist/bin/kctf-cluster
+++ b/dist/bin/kctf-cluster
@@ -647,7 +647,7 @@ function kctf_cluster_start_gce {
 
     gcloud projects add-iam-policy-binding ${PROJECT} --member=serviceAccount:${DNS_GSA_EMAIL} --role=roles/dns.admin || return
 
-    "${KCTF_BIN}/kubectl" create configmap --namespace kctf-system external-dns --from-literal=DOMAIN_NAME=${DOMAIN_NAME} --from-literal=EMAIL_ADDRESS=${EMAIL_ADDRESS:-} --dry-run=client -o yaml | "${KCTF_BIN}/kubectl" apply -f - || return
+    "${KCTF_BIN}/kubectl" create configmap --namespace kctf-system external-dns --from-literal=DOMAIN_NAME=${DOMAIN_NAME} --from-literal=EMAIL_ADDRESS=${EMAIL_ADDRESS:-} --from-literal=CLUSTER_NAME=${CLUSTER_NAME:-} --dry-run=client -o yaml | "${KCTF_BIN}/kubectl" apply -f - || return
   fi
 
   if [[ "${DISABLE_SRC_RANGES}" == "0" ]]; then
diff --git a/kctf-operator/resources/external-dns.go b/kctf-operator/resources/external-dns.go
index 6402dd80..230fc68e 100644
--- a/kctf-operator/resources/external-dns.go
+++ b/kctf-operator/resources/external-dns.go
@@ -86,10 +86,20 @@ func NewExternalDnsDeployment() client.Object {
 										Key: "DOMAIN_NAME",
 									},
 								},
-							}},
+							}, {
+								Name: "CLUSTER_NAME",
+								ValueFrom: &corev1.EnvVarSource{
+									ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
+										LocalObjectReference: corev1.LocalObjectReference{
+											Name: "external-dns",
+										},
+										Key: "CLUSTER_NAME",
+									},
+								},
+							}, },
 							Args: []string{"--log-level=debug", "--source=service", "--source=ingress",
 								"--provider=google", "--domain-filter=$(DOMAIN_NAME)", "--registry=txt",
-								"--txt-owner-id=kctf-cloud-dns"},
+								"--txt-owner-id=kctf-cloud-dns-$(CLUSTER_NAME)"},
 						},
 						{
 							Image: DOCKER_CERTBOT_IMAGE,