Merge pull request openstack-k8s-operators#178 from gibizer/namespace-delete

openshift-merge-bot[bot] · web-flow · commit de4c66cd0a2d · 2024-02-19T13:29:07.000Z
[DNSMasq]Check delete before creating ServiceAccount
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)
 }

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,11 @@ func (r *DNSMasqReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re`
`165`	`165`	`instance.Status.Hash = map[string]string{}`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ // Handle service delete`
	`169`	`+ if !instance.DeletionTimestamp.IsZero() {`
	`170`	`+ return r.reconcileDelete(ctx, instance, helper)`
	`171`	`+ }`
	`172`	`+`
`168`	`173`	`// Service account, role, binding`
`169`	`174`	`rbacRules := []rbacv1.PolicyRule{`
`170`	`175`	`{`
`@@ -186,11 +191,6 @@ func (r *DNSMasqReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re`
`186`	`191`	`return rbacResult, nil`
`187`	`192`	`}`
`188`	`193`
`189`		`- // Handle service delete`
`190`		`- if !instance.DeletionTimestamp.IsZero() {`
`191`		`- return r.reconcileDelete(ctx, instance, helper)`
`192`		`- }`
`193`		`-`
`194`	`194`	`// Handle non-deleted clusters`
`195`	`195`	`return r.reconcileNormal(ctx, instance, helper)`
`196`	`196`	`}`