Merge pull request #72 from stefanprodan/router

Refactor routing management

Author: stefanprodan

.travis.yml

@@ -21,7 +21,7 @@ script:
   - set -e
   - make test-fmt
   - make test-codegen
-  - go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/controller/
+  - go test -race -coverprofile=coverage.txt -covermode=atomic $(go list ./pkg/...)
   - make build
 
 after_success:

pkg/controller/controller.go

@@ -42,7 +42,6 @@ type Controller struct {
 	canaries      *sync.Map
 	jobs          map[string]CanaryJob
 	deployer      CanaryDeployer
-	router        CanaryRouter
 	observer      CanaryObserver
 	recorder      CanaryRecorder
 	notifier      *notifier.Slack
@@ -81,13 +80,6 @@ func NewController(
 		},
 	}
 
-	router := CanaryRouter{
-		logger:        logger,
-		kubeClient:    kubeClient,
-		istioClient:   istioClient,
-		flaggerClient: flaggerClient,
-	}
-
 	observer := CanaryObserver{
 		metricsServer: metricServer,
 	}
@@ -107,7 +99,6 @@ func NewController(
 		jobs:          map[string]CanaryJob{},
 		flaggerWindow: flaggerWindow,
 		deployer:      deployer,
-		router:        router,
 		observer:      observer,
 		recorder:      recorder,
 		notifier:      notifier,

pkg/controller/controller_test.go

@@ -8,6 +8,7 @@ import (
 	fakeFlagger "github.com/stefanprodan/flagger/pkg/client/clientset/versioned/fake"
 	informers "github.com/stefanprodan/flagger/pkg/client/informers/externalversions"
 	"github.com/stefanprodan/flagger/pkg/logging"
+	"github.com/stefanprodan/flagger/pkg/router"
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	hpav1 "k8s.io/api/autoscaling/v1"
@@ -33,10 +34,10 @@ type Mocks struct {
 	istioClient   istioclientset.Interface
 	flaggerClient clientset.Interface
 	deployer      CanaryDeployer
-	router        CanaryRouter
 	observer      CanaryObserver
 	ctrl          *Controller
 	logger        *zap.SugaredLogger
+	router        router.Interface
 }
 
 func SetupMocks() Mocks {
@@ -70,12 +71,6 @@ func SetupMocks() Mocks {
 			flaggerClient: flaggerClient,
 		},
 	}
-	router := CanaryRouter{
-		flaggerClient: flaggerClient,
-		kubeClient:    kubeClient,
-		istioClient:   istioClient,
-		logger:        logger,
-	}
 	observer := CanaryObserver{
 		metricsServer: "fake",
 	}
@@ -96,22 +91,26 @@ func SetupMocks() Mocks {
 		canaries:      new(sync.Map),
 		flaggerWindow: time.Second,
 		deployer:      deployer,
-		router:        router,
 		observer:      observer,
 		recorder:      NewCanaryRecorder(false),
 	}
 	ctrl.flaggerSynced = alwaysReady
 
+	// init router
+	rf := router.NewFactory(kubeClient, flaggerClient, logger, istioClient)
+	var meshRouter router.Interface
+	meshRouter = rf.IstioRouter()
+
 	return Mocks{
 		canary:        canary,
 		observer:      observer,
-		router:        router,
 		deployer:      deployer,
 		logger:        logger,
 		flaggerClient: flaggerClient,
 		istioClient:   istioClient,
 		kubeClient:    kubeClient,
 		ctrl:          ctrl,
+		router:        meshRouter,
 	}
 }