Removed service resource, updated client resource some

Removed the coupling between the OpenShift client and the Kube
client.  The two are separate.