fix ingress delete panic (#872)

apache · Feb 23, 2022 · 77383b8 · 77383b8
1 parent 26a1f43
commit 77383b8
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -192,18 +192,20 @@ func (c *ingressController) handleSyncErr(obj interface{}, err error) {
 	event := ev.Object.(kube.IngressEvent)
 	namespace, name, errLocal := cache.SplitMetaNamespaceKey(event.Key)
 	if errLocal != nil {
-		log.Errorf("invalid resource key: %s", event.Key)
+		log.Errorw("invalid resource key",
+			zap.Error(errLocal),
+		)
 		return
 	}
 
 	var ing kube.Ingress
 	switch event.GroupVersion {
 	case kube.IngressV1:
-		ing, err = c.controller.ingressLister.V1(namespace, name)
+		ing, errLocal = c.controller.ingressLister.V1(namespace, name)
 	case kube.IngressV1beta1:
-		ing, err = c.controller.ingressLister.V1beta1(namespace, name)
+		ing, errLocal = c.controller.ingressLister.V1beta1(namespace, name)
 	case kube.IngressExtensionsV1beta1:
-		ing, err = c.controller.ingressLister.ExtensionsV1beta1(namespace, name)
+		ing, errLocal = c.controller.ingressLister.ExtensionsV1beta1(namespace, name)
 	}
 
 	if err == nil {
@@ -219,7 +221,7 @@ func (c *ingressController) handleSyncErr(obj interface{}, err error) {
 					c.controller.recordStatus(ing.ExtensionsV1beta1(), _resourceSynced, nil, metav1.ConditionTrue, ing.ExtensionsV1beta1().GetGeneration())
 				}
 			} else {
-				log.Errorw("failed split namespace/name",
+				log.Errorw("failed to list ingress resource",
 					zap.Error(errLocal),
 				)
 			}
@@ -243,7 +245,7 @@ func (c *ingressController) handleSyncErr(obj interface{}, err error) {
 			c.controller.recordStatus(ing.ExtensionsV1beta1(), _resourceSyncAborted, err, metav1.ConditionTrue, ing.ExtensionsV1beta1().GetGeneration())
 		}
 	} else {
-		log.Errorw("failed split namespace/name",
+		log.Errorw("failed to list ingress resource",
 			zap.Error(errLocal),
 		)
 	}