fix: deadlock in controller (cherry-pick #14304)#14306

crenshaw-dev merged 1 commit intorelease-2.8argoproj/argo-cd:release-2.8from

cherry-pick-6eb9bc-release-2.8argoproj/argo-cd:cherry-pick-6eb9bc-release-2.8Copy head branch name to clipboard