Rebase kube upstream

So far I've fixed build and deploy controllers. Will be working more on this tomorrow.