Revert "Revert "Revert "namespace kctf zones by cluster name (#381)" (#427)" …"

This reverts commit fe8cd4c.

Author: sirdarckcat

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:-} --from-literal=CLUSTER_NAME=${CLUSTER_NAME:-} --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:-} --dry-run=client -o yaml | "${KCTF_BIN}/kubectl" apply -f - || return
   fi
 
   if [[ "${DISABLE_SRC_RANGES}" == "0" ]]; then

kctf-operator/resources/external-dns.go

@@ -86,20 +86,10 @@ 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-$(CLUSTER_NAME)"},
+								"--txt-owner-id=kctf-cloud-dns"},
 						},
 						{
 							Image: DOCKER_CERTBOT_IMAGE,