@@ -64,8 +64,13 @@ func getLabel(suffix string, obj client.Object) (string, bool) {
 }
 
 func setAnnotation(suffix string, value string, obj client.Object) {
-
 	key := fmt.Sprintf("%s/%s", AnnotationPrefix, ExternalDnsAnnotation)
 	annotations := obj.GetAnnotations()
+
+	if annotations == nil {
+		annotations = map[string]string{}
+		obj.SetAnnotations(annotations)
+	}
+
 	annotations[key] = value
 }
@@ -32,13 +32,18 @@ func (r *DnsReconciler) ReconcileDns(ctx context.Context, req reconcile.Request,
 	domain, domainFound := getDomainAnnotationOrLabel(obj)
 
 	if dnsExists {
-		if schm.IsResourceDeleted(obj) {
+		if schm.IsResourceDeleted(obj) && findFinalizer(obj) {
 
 			if err := r.cleanUpResource(domain, obj); err != nil {
 				r.Log.Error(err, "Error cleaning up resource DNS", "Resource", schm.GVKString(obj), "Name", obj.GetName())
 			} else {
 				r.Log.Info("DNS record removed", "Resource", schm.GVKString(obj), "Name", obj.GetName())
 			}
+
+			if err := r.deleteResource(ctx, obj); err != nil {
+				return reconcile.Result{}, err
+			}
+
 		}
 
 		return reconcile.Result{}, nil
@@ -98,10 +103,16 @@ func (r *DnsReconciler) setupResource(ctx context.Context, hostname string, obj
 	}
 
 	setExternalDnsAnnotation(mcDns.JoinARecordName(hostname, obj.GetName()), obj)
+	setFinalizer(obj)
 
 	if err := r.Update(ctx, obj); err != nil {
 		return err
 	}
 
 	return nil
 }
+
+func (r *DnsReconciler) deleteResource(ctx context.Context, obj client.Object) error {
+	removeFinalizer(obj)
+	return r.Update(ctx, obj)
+}
@@ -0,0 +1,38 @@
+package controller
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+const Finalizer = "kubernetes.io/agones-mc"
+
+func findFinalizer(obj client.Object) bool {
+	finalizers := obj.GetFinalizers()
+	for _, f := range finalizers {
+		if f == Finalizer {
+			return true
+		}
+	}
+	return false
+}
+
+func setFinalizer(obj client.Object) {
+	finalizers := obj.GetFinalizers()
+
+	if finalizers == nil {
+		finalizers = []string{}
+	}
+
+	obj.SetFinalizers(append(finalizers, Finalizer))
+}
+
+func removeFinalizer(obj client.Object) {
+	finalizers := obj.GetFinalizers()
+	newFinalizers := []string{}
+	for _, f := range finalizers {
+		if f != Finalizer {
+			newFinalizers = append(newFinalizers, f)
+		}
+	}
+	obj.SetFinalizers(newFinalizers)
+}
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,13 @@ func getLabel(suffix string, obj client.Object) (string, bool) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func setAnnotation(suffix string, value string, obj client.Object) {`
`67`		`-`
`68`	`67`	`key := fmt.Sprintf("%s/%s", AnnotationPrefix, ExternalDnsAnnotation)`
`69`	`68`	`annotations := obj.GetAnnotations()`
	`69`	`+`
	`70`	`+ if annotations == nil {`
	`71`	`+ annotations = map[string]string{}`
	`72`	`+ obj.SetAnnotations(annotations)`
	`73`	`+ }`
	`74`	`+`
`70`	`75`	`annotations[key] = value`
`71`	`76`	`}`