Use k8s-config for clientset

Former-commit-id: c8957c31485fc9ab3dd570c57d9a61c9ca1a2209 [formerly 00eddd5]
Former-commit-id: cda6a2d854dcd01c2e91fffa2b32ddc160577a0d

.travis.yml

@@ -28,7 +28,6 @@ install:
   - make pre-build
 
 script:
-  - sudo -E env PATH=$$PATH TEST_K8S=1
   - make build
   - make test
   - make src.test-coverage

config/k8s.json

@@ -36,8 +36,5 @@
         "dbVersion": "v1.0.0",
         "version": "<GIT_COMMIT>",
         "logFileName": "access_log"
-    },
-    "kubernetes": {
-         "namespace": "default"
-     }
+    }
 }

config/local.json

@@ -25,8 +25,5 @@
         "dbVersion": "v1.0.0",
         "version": "local",
         "logFileName": "access_log"
-    },
-    "kubernetes": {
-        "namespace": "default"
     }
 }

config/testing.json

@@ -25,8 +25,5 @@
     "dbVersion": "v1.0.0",
     "version": "local",
     "logFileName": "access_log"
-  },
-  "kubernetes": {
-    "namespace": "default"
   }
 }

src/config/config.go

@@ -17,6 +17,8 @@ type Config struct {
 
 	// the version settings of the current application
 	Version string `json:"version"`
+
+	Kubernetes string `json:"kubernetes"`
 }
 
 func Read(path string) (c Config, err error) {

src/kubernetes/nodes_test.go

@@ -1,37 +1,28 @@
 package kubernetes
 
 import (
-	"github.com/linkernetworks/config"
-	"github.com/linkernetworks/service/kubernetes"
+	"github.com/linkernetworks/kubeconfig"
 	"github.com/stretchr/testify/assert"
-	"os"
+	"k8s.io/client-go/kubernetes"
 	"testing"
 )
 
 func TestGetNodeFail(t *testing.T) {
-	if _, ok := os.LookupEnv("TEST_K8S"); !ok {
-		t.SkipNow()
-	}
+	config, err := kubeconfig.Load("")
+	assert.NoError(t, err)
 
-	kubernetes := kubernetes.NewFromConfig(&config.KubernetesConfig{
-		Namespace: "default",
-	})
-	clientset, err := kubernetes.NewClientset()
+	clientset, err := kubernetes.NewForConfig(config)
 	assert.NoError(t, err)
 
 	_, err = GetNode(clientset, "UnKnown_Name")
 	assert.Error(t, err)
 }
 
 func TestGetNodes(t *testing.T) {
-	if _, ok := os.LookupEnv("TEST_K8S"); !ok {
-		t.SkipNow()
-	}
+	config, err := kubeconfig.Load("")
+	assert.NoError(t, err)
 
-	kubernetes := kubernetes.NewFromConfig(&config.KubernetesConfig{
-		Namespace: "default",
-	})
-	clientset, err := kubernetes.NewClientset()
+	clientset, err := kubernetes.NewForConfig(config)
 	assert.NoError(t, err)
 
 	_, err = GetNodes(clientset)

src/serviceprovider/serviceprovider.go

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