Refactor kube auth

Partially resolves #2302 
That's fine, just making you aware of that upcoming change.