diff --git a/controllers/grafanafolder_controller.go b/controllers/grafanafolder_controller.go index 3830c9d45..ba54ee5f1 100644 --- a/controllers/grafanafolder_controller.go +++ b/controllers/grafanafolder_controller.go @@ -292,6 +292,11 @@ func (r *GrafanaFolderReconciler) onFolderCreated(ctx context.Context, grafana * return err } + // always update after resync period has elapsed even if cr is unchanged. + if exists && cr.Unchanged() && !cr.ResyncPeriodHasElapsed() { + return nil + } + if exists { // Add to status to cover cases: // - operator have previously failed to update status @@ -333,7 +338,7 @@ func (r *GrafanaFolderReconciler) onFolderCreated(ctx context.Context, grafana * } // NOTE: it's up to a user to reset permissions with correct json - if !cr.Unchanged() && cr.Spec.Permissions != "" { + if cr.Spec.Permissions != "" { permissions := grapi.PermissionItems{} err = json.Unmarshal([]byte(cr.Spec.Permissions), &permissions) if err != nil {