Fix incorrect namespace for origin kubectl commands

@smarterclayton actually, upstream reworked this using `clientcmd.Builder` and I assume we will get these with the next rebase as this change require some other dependencies and the commit I made to bump() it gets pretty large...

The other TODO items are legit, and I'm going to address it in upstream.