fix: patch roles properly (#7)

Agalin · Agalin · commit 7e7a3b71f49d · 2025-06-02T12:01:32.000+02:00
Patch call expects a modified existing resource as the first argument, not a set of new values. Now this logic should match official docs: https://sdk.operatorframework.io/docs/building-operators/golang/references/client/#patch Signed-off-by: Szymon Soloch <ssoloch@opera.com>
diff --git a/internal/cnpgi/operator/reconciler.go b/internal/cnpgi/operator/reconciler.go
@@ -184,8 +184,10 @@ func (r ReconcilerImplementation) ensureRole(
 		"namespace", newRole.Namespace,
 		"rules", newRole.Rules,
 	)
-	// TODO: Something is wrong here, we also should check for ownership.
-	return r.Client.Patch(ctx, newRole, client.MergeFrom(&role))
+
+	patch := client.MergeFrom(role.DeepCopy())
+	role.Rules = newRole.Rules
+	return r.Client.Patch(ctx, &role, patch)
 }
 
 func (r ReconcilerImplementation) ensureRoleBinding(

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,10 @@ func (r ReconcilerImplementation) ensureRole(`
`184`	`184`	`"namespace", newRole.Namespace,`
`185`	`185`	`"rules", newRole.Rules,`
`186`	`186`	`)`
`187`		`- // TODO: Something is wrong here, we also should check for ownership.`
`188`		`- return r.Client.Patch(ctx, newRole, client.MergeFrom(&role))`
	`187`	`+`
	`188`	`+ patch := client.MergeFrom(role.DeepCopy())`
	`189`	`+ role.Rules = newRole.Rules`
	`190`	`+ return r.Client.Patch(ctx, &role, patch)`
`189`	`191`	`}`
`190`	`192`
`191`	`193`	`func (r ReconcilerImplementation) ensureRoleBinding(`