Move deployer and config tracker to canary package

pkg/controller/controller_test.go

@@ -4,10 +4,11 @@ import (
 	"github.com/weaveworks/flagger/pkg/apis/flagger/v1alpha3"
 	istiov1alpha1 "github.com/weaveworks/flagger/pkg/apis/istio/common/v1alpha1"
 	istiov1alpha3 "github.com/weaveworks/flagger/pkg/apis/istio/v1alpha3"
+	"github.com/weaveworks/flagger/pkg/canary"
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
 	fakeFlagger "github.com/weaveworks/flagger/pkg/client/clientset/versioned/fake"
 	informers "github.com/weaveworks/flagger/pkg/client/informers/externalversions"
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"github.com/weaveworks/flagger/pkg/metrics"
 	"github.com/weaveworks/flagger/pkg/router"
 	"go.uber.org/zap"
@@ -34,7 +35,7 @@ type Mocks struct {
 	kubeClient    kubernetes.Interface
 	meshClient    clientset.Interface
 	flaggerClient clientset.Interface
-	deployer      CanaryDeployer
+	deployer      canary.Deployer
 	observer      metrics.Observer
 	ctrl          *Controller
 	logger        *zap.SugaredLogger
@@ -43,11 +44,11 @@ type Mocks struct {
 
 func SetupMocks(abtest bool) Mocks {
 	// init canary
-	canary := newTestCanary()
+	c := newTestCanary()
 	if abtest {
-		canary = newTestCanaryAB()
+		c = newTestCanaryAB()
 	}
-	flaggerClient := fakeFlagger.NewSimpleClientset(canary)
+	flaggerClient := fakeFlagger.NewSimpleClientset(c)
 
 	// init kube clientset and register mock objects
 	kubeClient := fake.NewSimpleClientset(
@@ -61,17 +62,17 @@ func SetupMocks(abtest bool) Mocks {
 		NewTestSecretVol(),
 	)
 
-	logger, _ := logging.NewLogger("debug")
+	logger, _ := logger.NewLogger("debug")
 
 	// init controller helpers
-	deployer := CanaryDeployer{
-		flaggerClient: flaggerClient,
-		kubeClient:    kubeClient,
-		logger:        logger,
-		configTracker: ConfigTracker{
-			logger:        logger,
-			kubeClient:    kubeClient,
-			flaggerClient: flaggerClient,
+	deployer := canary.Deployer{
+		Logger:        logger,
+		KubeClient:    kubeClient,
+		FlaggerClient: flaggerClient,
+		ConfigTracker: canary.ConfigTracker{
+			Logger:        logger,
+			KubeClient:    kubeClient,
+			FlaggerClient: flaggerClient,
 		},
 	}
 	observer := metrics.NewObserver("fake")
@@ -102,7 +103,7 @@ func SetupMocks(abtest bool) Mocks {
 	meshRouter := rf.MeshRouter("istio")
 
 	return Mocks{
-		canary:        canary,
+		canary:        c,
 		observer:      observer,
 		deployer:      deployer,
 		logger:        logger,