fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

config/samples/config.yaml

@@ -1,4 +1,4 @@
-log_level: "debug"                               # The log level of the APISIX Ingress Controller.
+log_level: "info"                               # The log level of the APISIX Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: apisix.apache.org/apisix-ingress-controller  # The controller name of the APISIX Ingress Controller,

internal/controller/apisixglobalrule_controller.go

@@ -18,7 +18,6 @@ import (
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -59,13 +58,13 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	var globalRule apiv2.ApisixGlobalRule
 	if err := r.Get(ctx, req.NamespacedName, &globalRule); err != nil {
-		if k8serrors.IsNotFound(err) {
+		if client.IgnoreNotFound(err) == nil {
 			log.Info("global rule not found, possibly deleted")
 			// Create a minimal object for deletion
 			globalRule.Namespace = req.Namespace
 			globalRule.Name = req.Name
 			globalRule.TypeMeta = metav1.TypeMeta{
-				Kind:       "ApisixGlobalRule",
+				Kind:       KindApisixGlobalRule,
 				APIVersion: apiv2.GroupVersion.String(),
 			}
 			// Delete from provider
@@ -75,19 +74,9 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			}
 			return ctrl.Result{}, nil
 		}
-		log.Error(err, "failed to get ApisixGlobalRule")
 		return ctrl.Result{}, err
 	}
 
-	// Check if the global rule is being deleted
-	if !globalRule.DeletionTimestamp.IsZero() {
-		if err := r.Provider.Delete(ctx, &globalRule); err != nil {
-			log.Error(err, "failed to delete global rule from provider")
-			return ctrl.Result{}, err
-		}
-		return ctrl.Result{}, nil
-	}
-
 	// create a translate context
 	tctx := provider.NewDefaultTranslateContext(ctx)
 
@@ -146,6 +135,12 @@ func (r *ApisixGlobalRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				predicate.NewPredicateFuncs(r.checkIngressClass),
 			),
 		).
+		WithEventFilter(
+			predicate.Or(
+				predicate.GenerationChangedPredicate{},
+				predicate.AnnotationChangedPredicate{},
+			),
+		).
 		Watches(
 			&networkingv1.IngressClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listGlobalRulesForIngressClass),
@@ -156,7 +151,6 @@ func (r *ApisixGlobalRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&v1alpha1.GatewayProxy{},
 			handler.EnqueueRequestsFromMapFunc(r.listGlobalRulesForGatewayProxy),
 		).
-		Named("apisixglobalrule").
 		Complete(r)
 }
 

internal/controller/utils.go

@@ -46,14 +46,15 @@ import (
 )
 
 const (
-	KindGateway      = "Gateway"
-	KindHTTPRoute    = "HTTPRoute"
-	KindGatewayClass = "GatewayClass"
-	KindIngress      = "Ingress"
-	KindIngressClass = "IngressClass"
-	KindGatewayProxy = "GatewayProxy"
-	KindSecret       = "Secret"
-	KindService      = "Service"
+	KindGateway          = "Gateway"
+	KindHTTPRoute        = "HTTPRoute"
+	KindGatewayClass     = "GatewayClass"
+	KindIngress          = "Ingress"
+	KindIngressClass     = "IngressClass"
+	KindGatewayProxy     = "GatewayProxy"
+	KindSecret           = "Secret"
+	KindService          = "Service"
+	KindApisixGlobalRule = "ApisixGlobalRule"
 )
 
 const defaultIngressClassAnnotation = "ingressclass.kubernetes.io/is-default-class"

internal/provider/adc/adc.go

@@ -53,6 +53,8 @@ const (
 type adcClient struct {
 	sync.Mutex
 
+	syncLock sync.Mutex
+
 	translator *translator.Translator
 	// gateway/ingressclass -> adcConfig
 	configs map[types.NamespacedNameKind]adcConfig
@@ -220,8 +222,8 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 	case *networkingv1.IngressClass:
 		// delete all resources
 	case *apiv2.ApisixGlobalRule:
-		// don't need gen labels for global rule?
 		resourceTypes = append(resourceTypes, "global_rule")
+		labels = label.GenLabel(obj)
 	}
 
 	rk := utils.NamespacedNameKind(obj)
@@ -292,6 +294,9 @@ func (d *adcClient) Start(ctx context.Context) error {
 }
 
 func (d *adcClient) Sync(ctx context.Context) error {
+	d.syncLock.Lock()
+	defer d.syncLock.Unlock()
+
 	log.Debug("syncing all resources")
 
 	if len(d.configs) == 0 {