Fix the e2e tests and kubecfg given recent additional validation.
Merge pull request #2010 from brendandburns/fix

Fix the e2e tests and kubecfg given recent additional validation.