[apisix-ingress-controller] branch master updated: fix ingress delete panic (#872)

[zhangjintao]

This is an automated email from the ASF dual-hosted git repository.

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 77383b8  fix ingress delete panic (#872)
77383b8 is described below

commit 77383b88d9c664a64a28374c7f48cdb1d4d5f823
Author: champly <cham...@outlook.com>
AuthorDate: Wed Feb 23 11:18:10 2022 +0800

    fix ingress delete panic (#872)
---
 pkg/ingress/ingress.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
index b5ffbb6..c97dc83 100644
--- 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),
                )
        }