fix: k8s upgrade e2e tests#13984

crenshaw-dev wants to merge 4 commits intoargoproj:masterargoproj/argo-cd:masterfrom

crenshaw-dev:k8s-server-side-stuffcrenshaw-dev/argo-cd:k8s-server-side-stuffCopy head branch name to clipboard