Resolved merge conflict

Signed-off-by: hongming <talonwan@yunify.com>
2019-04-08 22:54:51 +08:00
parent 93ad572e19 d01cdf3b3c
commit c4c021b5a2
327 changed files with 64018 additions and 406 deletions
--- a/cmd/controller-manager/app/controllers.go
+++ b/cmd/controller-manager/app/controllers.go
@@ -67,7 +67,8 @@ func AddControllers(mgr manager.Manager, cfg *rest.Config, stopCh <-chan struct{
 		istioInformer.Networking().V1alpha3().DestinationRules(),
 		servicemeshinformer.Servicemesh().V1alpha2().Strategies(),
 		kubeClient,
-		istioclient)
+		istioclient,
+		servicemeshclient)

 	drController := destinationrule.NewDestinationRuleController(informerFactory.Apps().V1().Deployments(),
 		istioInformer.Networking().V1alpha3().DestinationRules(),