fix: role patching (#325)

leonardoce · web-flow · commit f484b9e748ad · 2025-05-08T11:58:31.000+02:00
Closes: #318 Signed-off-by: Leonardo Cecchi <leonardo.cecchi@enterprisedb.com>
diff --git a/internal/cnpgi/operator/reconciler.go b/internal/cnpgi/operator/reconciler.go
@@ -160,7 +160,13 @@ func (r ReconcilerImplementation) ensureRole(
 		"rules", newRole.Rules,
 	)
 
-	return r.Client.Patch(ctx, newRole, client.MergeFrom(&role))
+	oldRole := role.DeepCopy()
+
+	// Apply to the role the new rules
+	role.Rules = newRole.Rules
+
+	// Push it back to the API server
+	return r.Client.Patch(ctx, &role, client.MergeFrom(oldRole))
 }
 
 func (r ReconcilerImplementation) ensureRoleBinding(

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,13 @@ func (r ReconcilerImplementation) ensureRole(`
`160`	`160`	`"rules", newRole.Rules,`
`161`	`161`	`)`
`162`	`162`
`163`		`- return r.Client.Patch(ctx, newRole, client.MergeFrom(&role))`
	`163`	`+ oldRole := role.DeepCopy()`
	`164`	`+`
	`165`	`+ // Apply to the role the new rules`
	`166`	`+ role.Rules = newRole.Rules`
	`167`	`+`
	`168`	`+ // Push it back to the API server`
	`169`	`+ return r.Client.Patch(ctx, &role, client.MergeFrom(oldRole))`
`164`	`170`	`}`
`165`	`171`
`166`	`172`	`func (r ReconcilerImplementation) ensureRoleBinding(`