Merge branch 'master' into master

2019-03-30 19:01:03 +08:00
parent 250933de73 5392478077
commit 1a56abed77
29 changed files with 2105 additions and 568 deletions
--- a/cmd/controller-manager/app/controllers.go
+++ b/cmd/controller-manager/app/controllers.go
@@ -56,6 +56,7 @@ func AddControllers(mgr manager.Manager, cfg *rest.Config, stopCh <-chan struct{
 	drController := destinationrule.NewDestinationRuleController(informerFactory.Apps().V1().Deployments(),
 		istioInformer.Networking().V1alpha3().DestinationRules(),
 		informerFactory.Core().V1().Services(),
+		servicemeshinformer.Servicemesh().V1alpha2().ServicePolicies(),
 		kubeClient,
 		istioclient)