Merge pull request #1602 from timp87/fix-grafanafolder-permission-reconciliation

theSuess · web-flow · commit 65c8137295bf · 2024-07-04T07:53:22.000Z
fix: use correct folder uid to update permissions
diff --git a/controllers/grafanafolder_controller.go b/controllers/grafanafolder_controller.go
@@ -332,6 +332,8 @@ func (r *GrafanaFolderReconciler) onFolderCreated(ctx context.Context, grafana *
 	}
 
 	if exists {
+		// make sure we use the correct UID
+		uid = remoteUID
 		// Add to status to cover cases:
 		// - operator have previously failed to update status
 		// - the folder was created outside of operator

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,8 @@ func (r GrafanaFolderReconciler) onFolderCreated(ctx context.Context, grafana `
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`if exists {`
	`335`	`+ // make sure we use the correct UID`
	`336`	`+ uid = remoteUID`
`335`	`337`	`// Add to status to cover cases:`
`336`	`338`	`// - operator have previously failed to update status`
`337`	`339`	`// - the folder was created outside of operator`