Breakup all the Broker Clients into a clients pkg

pkg/apb/client.go

@@ -11,9 +11,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	restclient "k8s.io/client-go/rest"
 
+	"github.com/openshift/ansible-service-broker/pkg/clients"
 	"github.com/pborman/uuid"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/homedir"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
@@ -40,8 +39,6 @@ First cut might have to pass kubecfg from broker. FIRST SPRINT broker passes use
 admin/admin
 */
 
-var DockerSocket = "unix:///var/run/docker.sock"
-
 type ClusterConfig struct {
 	InCluster bool
 	Target    string
@@ -56,53 +53,16 @@ type Client struct {
 	log           *logging.Logger
 }
 
-func createClientConfigFromFile(configPath string) (*restclient.Config, error) {
-	clientConfig, err := clientcmd.LoadFromFile(configPath)
-	if err != nil {
-		return nil, err
-	}
-
-	config, err := clientcmd.NewDefaultClientConfig(*clientConfig, &clientcmd.ConfigOverrides{}).ClientConfig()
-	if err != nil {
-		return nil, err
-	}
-	return config, nil
-}
-
 func NewClient(log *logging.Logger) (*Client, error) {
-	dockerClient, err := docker.NewClient(DockerSocket)
-	if err != nil {
-		log.Error("Could not load docker client")
-		return nil, err
-	}
-
-	// NOTE: Both the external and internal client object are using the same
-	// clientset library. Internal clientset normally uses a different
-	// library
-	clientConfig, err := restclient.InClusterConfig()
-	if err != nil {
-		log.Warning("Failed to create a InternalClientSet: %v.", err)
-
-		log.Debug("Checking for a local Cluster Config")
-		clientConfig, err = createClientConfigFromFile(homedir.HomeDir() + "/.kube/config")
-		if err != nil {
-			log.Error("Failed to create LocalClientSet")
-			return nil, err
-		}
-	}
-
-	clientset, err := clientset.NewForConfig(clientConfig)
-	if err != nil {
-		log.Error("Failed to create LocalClientSet")
-		return nil, err
-	}
-
-	rest := clientset.CoreV1().RESTClient()
+	//TODO: This object gets created each provision, bind, deprovision,
+	// and unbind.  Instead, those functions should be using the global
+	// clients were needed and this class needs to be reworked.
+	k8s := clients.Clients.KubernetesClient
 
 	client := &Client{
-		dockerClient:  dockerClient,
-		ClusterClient: clientset,
-		RESTClient:    rest,
+		dockerClient:  clients.Clients.DockerClient,
+		ClusterClient: k8s,
+		RESTClient:    k8s.CoreV1().RESTClient(),
 		log:           log,
 	}
 
@@ -178,14 +138,14 @@ func (c *Client) RunImage(
 	}
 
 	c.log.Notice(fmt.Sprintf("Creating pod %q in the %s namespace", pod.Name, ns))
-	_, err = c.ClusterClient.CoreV1().Pods(ns).Create(pod)
+	_, err = clients.Clients.KubernetesClient.CoreV1().Pods(ns).Create(pod)
 
 	return apbId, err
 }
 
 func (c *Client) PullImage(imageName string) error {
 	// Under what circumstances does this error out?
-	c.dockerClient.PullImage(docker.PullImageOptions{
+	clients.Clients.DockerClient.PullImage(docker.PullImageOptions{
 		Repository:   imageName,
 		OutputStream: os.Stdout,
 	}, docker.AuthConfiguration{})

pkg/app/app.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/openshift/ansible-service-broker/pkg/apb"
 	"github.com/openshift/ansible-service-broker/pkg/broker"
+	"github.com/openshift/ansible-service-broker/pkg/clients"
 	"github.com/openshift/ansible-service-broker/pkg/dao"
 	"github.com/openshift/ansible-service-broker/pkg/handler"
 )
@@ -48,6 +49,8 @@ func CreateApp() App {
 	fmt.Println("==           Starting Ansible Service Broker...           ==")
 	fmt.Println("============================================================")
 
+	//TODO: Let's take all these validations and delegate them to the client
+	// pkg.
 	if app.config, err = CreateConfig(app.args.ConfigFile); err != nil {
 		os.Stderr.WriteString("ERROR: Failed to read config file\n")
 		os.Stderr.WriteString(err.Error())
@@ -60,12 +63,14 @@ func CreateApp() App {
 		os.Exit(1)
 	}
 
-	app.log.Debug("Connecting Dao")
-	if app.dao, err = dao.NewDao(app.config.Dao, app.log.Logger); err != nil {
-		app.log.Error("Failed to initialize Dao\n")
+	app.log.Debug("Creating Etcd Client")
+	if err = clients.NewEtcd(app.config.Dao, app.log.Logger); err != nil {
+		app.log.Error("Failed to initialize Etcd Client\n")
 		app.log.Error(err.Error())
 		os.Exit(1)
 	}
+
+	app.log.Debug("Connecting to Etcd")
 	serv, clust, err := app.dao.GetEtcdVersion(app.config.Dao)
 	if err != nil {
 		app.log.Error("Failed to connect to Etcd\n")
@@ -74,16 +79,18 @@ func CreateApp() App {
 	}
 	app.log.Info("Etcd Version [Server: %s, Cluster: %s]", serv, clust)
 
-	app.log.Debug("Creating Cluster Client")
-	client, err := apb.NewClient(app.log.Logger)
-	if err != nil {
+	app.log.Debug("Connecting Dao")
+	app.dao = dao.NewDao(app.config.Dao, app.log.Logger)
+
+	app.log.Debug("Creating Kubernetes Client")
+	if err = clients.NewKubernetes(app.log.Logger); err != nil {
 		app.log.Error(err.Error())
 		os.Exit(1)
 	}
-	app.log.Info("Cluster Client Created")
 
 	app.log.Debug("Connecting to Cluster")
-	body, err := client.RESTClient.Get().AbsPath("/version").Do().Raw()
+
+	body, err := clients.Clients.RESTClient.Get().AbsPath("/version").Do().Raw()
 	if err != nil {
 		app.log.Error(err.Error())
 		os.Exit(1)
@@ -103,6 +110,12 @@ func CreateApp() App {
 		os.Exit(1)
 	}
 
+	app.log.Debug("Creating Docker Client")
+	if err = clients.NewDocker(app.log.Logger); err != nil {
+		app.log.Error(err.Error())
+		os.Exit(1)
+	}
+
 	app.log.Debug("Connecting Registry")
 	if app.registry, err = apb.NewRegistry(
 		app.config.Registry, app.log.Logger,

pkg/app/config.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/openshift/ansible-service-broker/pkg/apb"
 	"github.com/openshift/ansible-service-broker/pkg/broker"
-	"github.com/openshift/ansible-service-broker/pkg/dao"
+	"github.com/openshift/ansible-service-broker/pkg/clients"
 )
 
 type Config struct {
 	Registry   apb.RegistryConfig
-	Dao        dao.Config
+	Dao        clients.EtcdConfig
 	Log        LogConfig
 	Openshift  apb.ClusterConfig
 	ConfigFile string

pkg/clients/clients.go

@@ -0,0 +1,16 @@
+package clients
+
+import (
+	d "github.com/fsouza/go-dockerclient"
+
+	"github.com/coreos/etcd/client"
+	"k8s.io/client-go/rest"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+)
+
+var Clients struct {
+	EtcdClient       client.Client
+	KubernetesClient *clientset.Clientset
+	DockerClient     *d.Client
+	RESTClient       rest.Interface
+}

pkg/clients/docker.go

@@ -0,0 +1,17 @@
+package clients
+
+import (
+	docker "github.com/fsouza/go-dockerclient"
+	logging "github.com/op/go-logging"
+)
+
+func NewDocker(log *logging.Logger) error {
+	dockerClient, err := docker.NewClient(DockerSocket)
+	if err != nil {
+		log.Error("Could not load docker client")
+		return err
+	}
+
+	Clients.DockerClient = dockerClient
+	return nil
+}

pkg/clients/etcd.go

@@ -0,0 +1,41 @@
+package clients
+
+import (
+	"fmt"
+	"time"
+
+	logging "github.com/op/go-logging"
+
+	"github.com/coreos/etcd/client"
+)
+
+type EtcdConfig struct {
+	EtcdHost string `yaml:"etcd_host"`
+	EtcdPort string `yaml:"etcd_port"`
+}
+
+func NewEtcd(config EtcdConfig, log *logging.Logger) error {
+	// TODO: Config validation
+	endpoints := []string{etcdEndpoint(config.EtcdHost, config.EtcdPort)}
+
+	log.Info("== ETCD CX ==")
+	log.Infof("EtcdHost: %s", config.EtcdHost)
+	log.Infof("EtcdPort: %s", config.EtcdPort)
+	log.Infof("Endpoints: %v", endpoints)
+
+	etcdClient, err := client.New(client.Config{
+		Endpoints:               endpoints,
+		Transport:               client.DefaultTransport,
+		HeaderTimeoutPerRequest: time.Second,
+	})
+	if err != nil {
+		return err
+	}
+
+	Clients.EtcdClient = etcdClient
+	return nil
+}
+
+func etcdEndpoint(host string, port string) string {
+	return fmt.Sprintf("http://%s:%s", host, port)
+}

pkg/clients/kubernetes.go

@@ -0,0 +1,52 @@
+package clients
+
+import (
+	logging "github.com/op/go-logging"
+	restclient "k8s.io/client-go/rest"
+
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/util/homedir"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+)
+
+func createClientConfigFromFile(configPath string) (*restclient.Config, error) {
+	clientConfig, err := clientcmd.LoadFromFile(configPath)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := clientcmd.NewDefaultClientConfig(*clientConfig, &clientcmd.ConfigOverrides{}).ClientConfig()
+	if err != nil {
+		return nil, err
+	}
+	return config, nil
+}
+
+func NewKubernetes(log *logging.Logger) error {
+	// NOTE: Both the external and internal client object are using the same
+	// clientset library. Internal clientset normally uses a different
+	// library
+	clientConfig, err := restclient.InClusterConfig()
+	if err != nil {
+		log.Warning("Failed to create a InternalClientSet: %v.", err)
+
+		log.Debug("Checking for a local Cluster Config")
+		clientConfig, err = createClientConfigFromFile(homedir.HomeDir() + "/.kube/config")
+		if err != nil {
+			log.Error("Failed to create LocalClientSet")
+			return err
+		}
+	}
+
+	clientset, err := clientset.NewForConfig(clientConfig)
+	if err != nil {
+		log.Error("Failed to create LocalClientSet")
+		return err
+	}
+
+	rest := clientset.CoreV1().RESTClient()
+
+	Clients.RESTClient = rest
+	Clients.KubernetesClient = clientset
+	return nil
+}

pkg/clients/types.go

@@ -0,0 +1,5 @@
+package clients
+
+const (
+	DockerSocket = "unix:///var/run/docker.sock"
+)