fix: controller err handler should ignore not found error (#893)

apache · Mar 8, 2022 · 1159522 · 1159522
1 parent f84a083
commit 1159522
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 1 deletion.
diff --git a/pkg/ingress/apisix_cluster_config.go b/pkg/ingress/apisix_cluster_config.go
@@ -190,6 +190,15 @@ func (c *apisixClusterConfigController) handleSyncErr(obj interface{}, err error
 		c.controller.MetricsCollector.IncrSyncOperation("clusterConfig", "success")
 		return
 	}
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync ApisixClusterConfig but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("ApisixClusterConfig", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync ApisixClusterConfig failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),

diff --git a/pkg/ingress/apisix_consumer.go b/pkg/ingress/apisix_consumer.go
@@ -144,6 +144,15 @@ func (c *apisixConsumerController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("consumer", "success")
 		return
 	}
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync ApisixConsumer but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("ApisixConsumer", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync ApisixConsumer failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),

diff --git a/pkg/ingress/apisix_pluginconfig.go b/pkg/ingress/apisix_pluginconfig.go
@@ -190,6 +190,14 @@ func (c *apisixPluginConfigController) sync(ctx context.Context, ev *types.Event
 func (c *apisixPluginConfigController) handleSyncErr(obj interface{}, errOrigin error) {
 	ev := obj.(*types.Event)
 	event := ev.Object.(kube.ApisixPluginConfigEvent)
+	if k8serrors.IsNotFound(errOrigin) && ev.Type != types.EventDelete {
+		log.Infow("sync ApisixPluginConfig but not found, ignore",
+			zap.String("event_type", ev.Type.String()),
+			zap.String("ApisixPluginConfig", ev.Object.(kube.ApisixPluginConfigEvent).Key),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	namespace, name, errLocal := cache.SplitMetaNamespaceKey(event.Key)
 	if errLocal != nil {
 		log.Errorf("invalid resource key: %s", event.Key)

diff --git a/pkg/ingress/apisix_route.go b/pkg/ingress/apisix_route.go
@@ -261,6 +261,14 @@ func (c *apisixRouteController) checkPluginNameIfNotEmptyV2beta3(ctx context.Con
 func (c *apisixRouteController) handleSyncErr(obj interface{}, errOrigin error) {
 	ev := obj.(*types.Event)
 	event := ev.Object.(kube.ApisixRouteEvent)
+	if k8serrors.IsNotFound(errOrigin) && ev.Type != types.EventDelete {
+		log.Infow("sync ApisixRoute but not found, ignore",
+			zap.String("event_type", ev.Type.String()),
+			zap.String("ApisixRoute", ev.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	namespace, name, errLocal := cache.SplitMetaNamespaceKey(event.Key)
 	if errLocal != nil {
 		log.Errorf("invalid resource key: %s", event.Key)

diff --git a/pkg/ingress/apisix_tls.go b/pkg/ingress/apisix_tls.go
@@ -175,6 +175,16 @@ func (c *apisixTlsController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("TLS", "success")
 		return
 	}
+
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync ApisixTls but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("ApisixTls", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync ApisixTls failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),

diff --git a/pkg/ingress/apisix_upstream.go b/pkg/ingress/apisix_upstream.go
@@ -207,6 +207,16 @@ func (c *apisixUpstreamController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("upstream", "success")
 		return
 	}
+
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync ApisixUpstream but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("ApisixUpstream", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync ApisixUpstream failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),

diff --git a/pkg/ingress/endpoint.go b/pkg/ingress/endpoint.go
@@ -101,6 +101,15 @@ func (c *endpointsController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("endpoints", "success")
 		return
 	}
+	event := obj.(*types.Event)
+	if errors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync endpoints but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.Any("endpoints", event.Object.(kube.Endpoint)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync endpoints failed, will retry",
 		zap.Any("object", obj),
 	)

diff --git a/pkg/ingress/endpointslice.go b/pkg/ingress/endpointslice.go
@@ -20,6 +20,7 @@ import (
 
 	"go.uber.org/zap"
 	discoveryv1 "k8s.io/api/discovery/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
@@ -112,6 +113,15 @@ func (c *endpointSliceController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("endpointSlice", "success")
 		return
 	}
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync endpointSlice but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("endpointSlice", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync endpointSlice failed, will retry",
 		zap.Any("object", obj),
 	)

diff --git a/pkg/ingress/gateway.go b/pkg/ingress/gateway.go
@@ -125,6 +125,15 @@ func (c *gatewayController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("gateway", "success")
 		return
 	}
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync gateway but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("gateway", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	log.Warnw("sync gateway failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),

diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -190,6 +190,14 @@ func (c *ingressController) sync(ctx context.Context, ev *types.Event) error {
 func (c *ingressController) handleSyncErr(obj interface{}, err error) {
 	ev := obj.(*types.Event)
 	event := ev.Object.(kube.IngressEvent)
+	if k8serrors.IsNotFound(err) && ev.Type != types.EventDelete {
+		log.Infow("sync ingress but not found, ignore",
+			zap.String("event_type", ev.Type.String()),
+			zap.String("ingress", event.Key),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
 	namespace, name, errLocal := cache.SplitMetaNamespaceKey(event.Key)
 	if errLocal != nil {
 		log.Errorw("invalid resource key",

diff --git a/pkg/ingress/secret.go b/pkg/ingress/secret.go
@@ -221,7 +221,16 @@ func (c *secretController) handleSyncErr(obj interface{}, err error) {
 		c.controller.MetricsCollector.IncrSyncOperation("secret", "success")
 		return
 	}
-	log.Warnw("sync ApisixTls failed, will retry",
+	event := obj.(*types.Event)
+	if k8serrors.IsNotFound(err) && event.Type != types.EventDelete {
+		log.Infow("sync secret but not found, ignore",
+			zap.String("event_type", event.Type.String()),
+			zap.String("secret", event.Object.(string)),
+		)
+		c.workqueue.Forget(event)
+		return
+	}
+	log.Warnw("sync secret failed, will retry",
 		zap.Any("object", obj),
 		zap.Error(err),
 	)