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

…onciliation fix: use correct folder uid to update permissions
grafana · Jul 4, 2024 · 65c8137 · 65c8137
2 parents 58f6a0c + 3695416
commit 65c8137
Showing 1 changed file with 2 additions and 0 deletions.
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