Merge pull request #178 from gibizer/namespace-delete

[DNSMasq]Check delete before creating ServiceAccount
openstack-k8s-operators · Feb 19, 2024 · de4c66c · de4c66c
2 parents 4fef7af + c3054ae
commit de4c66c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/controllers/network/dnsmasq_controller.go b/controllers/network/dnsmasq_controller.go
@@ -165,6 +165,11 @@ func (r *DNSMasqReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 		instance.Status.Hash = map[string]string{}
 	}
 
+	// Handle service delete
+	if !instance.DeletionTimestamp.IsZero() {
+		return r.reconcileDelete(ctx, instance, helper)
+	}
+
 	// Service account, role, binding
 	rbacRules := []rbacv1.PolicyRule{
 		{
@@ -186,11 +191,6 @@ func (r *DNSMasqReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 		return rbacResult, nil
 	}
 
-	// Handle service delete
-	if !instance.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, instance, helper)
-	}
-
 	// Handle non-deleted clusters
 	return r.reconcileNormal(ctx, instance, helper)
 }