Merge pull request #25 from linkernetworks/alex/serviceproviderk8s

Add k8s clientset to service provider

src/config/config.go

@@ -8,6 +8,7 @@ import (
 	"github.com/linkernetworks/logger"
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/redis"
+	"k8s.io/client-go/rest"
 )
 
 type Config struct {
@@ -18,7 +19,7 @@ type Config struct {
 	// the version settings of the current application
 	Version string `json:"version"`
 
-	Kubernetes string `json:"kubernetes"`
+	Kubernetes *rest.Config `json:"kubernetes"`
 }
 
 func Read(path string) (c Config, err error) {

src/serviceprovider/serviceprovider.go

@@ -4,17 +4,16 @@ import (
 	"github.com/linkernetworks/logger"
 	"github.com/linkernetworks/vortex/src/config"
 
-	"github.com/linkernetworks/kubeconfig"
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/redis"
-	"k8s.io/client-go/rest"
+	"k8s.io/client-go/kubernetes"
 )
 
 type Container struct {
 	Config     config.Config
 	Redis      *redis.Service
 	Mongo      *mongo.Service
-	Kubernetes *rest.Config
+	Kubernetes kubernetes.Interface
 }
 
 type ServiceDiscoverResponse struct {
@@ -33,13 +32,20 @@ func New(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
-	k8sConfig, _ := kubeconfig.Load(cf.Kubernetes)
-
 	sp := &Container{
-		Config:     cf,
-		Redis:      redisService,
-		Mongo:      mongo,
-		Kubernetes: k8sConfig,
+		Config: cf,
+		Redis:  redisService,
+		Mongo:  mongo,
+	}
+
+	if cf.Kubernetes == nil {
+		logger.Warnln("kubernetes service is not loaded: kubernetes config is not defined.")
+	} else {
+		clientset, err := kubernetes.NewForConfig(cf.Kubernetes)
+		if err != nil {
+			logger.Fatalf("did not connect kubernetes: %v", err)
+		}
+		sp.Kubernetes = clientset
 	}
 
 	return sp