fix conflict

Former-commit-id: 6053ed8bf227947e9d64bae1bfc15eba0a94f388 [formerly 6053ed8bf227947e9d64bae1bfc15eba0a94f388 [formerly 7948830]]
Former-commit-id: f0356376d65c16756573b02b0a9df26f2806d7fd
Former-commit-id: 7cd66c1

src/serviceprovider/serviceprovider.go

@@ -43,16 +43,8 @@ func New(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
-	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
-	k8s, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
-	if err != nil {
-		k8s, err = rest.InClusterConfig()
-		if err != nil {
-			panic(fmt.Errorf("Load the kubernetes config fail"))
-		}
-	}
-
-	clientset := kubernetes.NewForConfigOrDie(k8s)
+	logger.Infof("Connecting to prometheus: %s", cf.Prometheus.Url)
+	prometheus := prometheus.New(cf.Prometheus.Url)
 
 	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
 	k8s, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
@@ -92,32 +84,11 @@ func NewForTesting(cf config.Config) *Container {
 	clientset := fakeclientset.NewSimpleClientset()
 
 	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
-	}
-
-	return sp
-}
-
-func NewForTesting(cf config.Config) *Container {
-	// setup logger configuration
-	logger.Setup(cf.Logger)
-
-	logger.Infof("Connecting to redis: %s", cf.Redis.Addr())
-	redisService := redis.New(cf.Redis)
-
-	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
-	mongo := mongo.New(cf.Mongo.Url)
-
-	clientset := fakeclientset.NewSimpleClientset()
-
-	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
+		Config:     cf,
+		Redis:      redisService,
+		Mongo:      mongo,
+		Prometheus: prometheus,
+		KubeCtl:    kubeCtl.New(clientset, "default"),
 	}
 
 	return sp