Cherry pick PR #2031 to v0.10.x#2035

theishshah merged 3 commits intooperator-framework:v0.10.xoperator-framework/operator-sdk:v0.10.xfrom

theishshah:v10cherry-picktheishshah/operator-sdk:v10cherry-pickCopy head branch name to clipboard