Rebase to latest kubernetes rev