basics seem working!

pkg/controller/controller.go

@@ -2,10 +2,12 @@ package controller
 
 import (
 	"fmt"
-	"github.com/weaveworks/flagger/pkg/metrics"
 	"sync"
 	"time"
 
+	"github.com/weaveworks/flagger/pkg/metrics"
+	"github.com/weaveworks/flagger/pkg/router"
+
 	"github.com/google/go-cmp/cmp"
 	flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1alpha3"
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
@@ -45,6 +47,7 @@ type Controller struct {
 	observer      metrics.Observer
 	recorder      metrics.Recorder
 	notifier      *notifier.Slack
+	routerFactory *router.Factory
 	meshProvider  string
 }
 
@@ -57,6 +60,7 @@ func NewController(
 	metricServer string,
 	logger *zap.SugaredLogger,
 	notifier *notifier.Slack,
+	routerFactory *router.Factory,
 	meshProvider string,
 	version string,
 ) *Controller {
@@ -100,6 +104,7 @@ func NewController(
 		observer:      metrics.NewObserver(metricServer),
 		recorder:      recorder,
 		notifier:      notifier,
+		routerFactory: routerFactory,
 		meshProvider:  meshProvider,
 	}
 

pkg/controller/scheduler.go

@@ -2,12 +2,13 @@ package controller
 
 import (
 	"fmt"
-	"github.com/weaveworks/flagger/pkg/router"
 	"strings"
 	"time"
 
+	"github.com/weaveworks/flagger/pkg/router"
+
 	flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1alpha3"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // scheduleCanaries synchronises the canary map with the jobs map,
@@ -96,11 +97,10 @@ func (c *Controller) advanceCanary(name string, namespace string, skipLivenessCh
 	}
 
 	// init routers
-	routerFactory := router.NewFactory(c.kubeClient, c.flaggerClient, c.logger, c.istioClient)
-	meshRouter := routerFactory.MeshRouter(c.meshProvider)
+	meshRouter := c.routerFactory.MeshRouter(c.meshProvider)
 
 	// create or update ClusterIP services
-	if err := routerFactory.KubernetesRouter().Reconcile(cd); err != nil {
+	if err := c.routerFactory.KubernetesRouter().Reconcile(cd); err != nil {
 		c.recordEventWarningf(cd, "%v", err)
 		return
 	}