Ginkgo migration clean#1973

gangwgr wants to merge 4 commits intoopenshift:mainopenshift/cluster-kube-apiserver-operator:mainfrom

gangwgr:ginkgo-migration-cleangangwgr/cluster-kube-apiserver-operator:ginkgo-migration-cleanCopy head branch name to clipboard