From b5d9d29fc6130807a5450afbf5091ebfb86b9d4e Mon Sep 17 00:00:00 2001 From: zryfish Date: Wed, 19 Aug 2020 14:50:18 +0800 Subject: [PATCH] fix servicemesh strategy not applied bug (#2892) Signed-off-by: Jeff --- .../virtualservice/virtualservice_controller.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go index 81385143f..f340f4ab6 100644 --- a/pkg/controller/virtualservice/virtualservice_controller.go +++ b/pkg/controller/virtualservice/virtualservice_controller.go @@ -443,22 +443,13 @@ func (v *VirtualServiceController) addDestinationRule(obj interface{}) { return } - _, err = v.virtualServiceLister.VirtualServices(dr.Namespace).Get(dr.Name) + key, err := cache.MetaNamespaceKeyFunc(service) if err != nil { - if errors.IsNotFound(err) { - key, err := cache.MetaNamespaceKeyFunc(service) - if err != nil { - utilruntime.HandleError(fmt.Errorf("get service %s/%s key failed", service.Namespace, service.Name)) - return - } - - v.queue.Add(key) - } - } else { - // Already have a virtualservice created. + utilruntime.HandleError(fmt.Errorf("get service %s/%s key failed", service.Namespace, service.Name)) + return } - return + v.queue.Add(key) } // when a strategy created