Fix the e2e tests and kubecfg given recent additional validation.