fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/webhook/v1/apisixconsumer_webhook.go

@@ -65,7 +65,7 @@ func (v *ApisixConsumerCustomValidator) ValidateCreate(ctx context.Context, obj
 	}
 	apisixConsumerLog.Info("Validation for ApisixConsumer upon creation", "name", consumer.GetName(), "namespace", consumer.GetNamespace())
 
-	if !controller.MatchesIngressClass(v.Client, apisixConsumerLog, consumer) {
+	if !controller.MatchesIngressClass(v.Client, apisixConsumerLog, consumer, "") {
 		return nil, nil
 	}
 
@@ -78,7 +78,7 @@ func (v *ApisixConsumerCustomValidator) ValidateUpdate(ctx context.Context, oldO
 		return nil, fmt.Errorf("expected an ApisixConsumer object for the newObj but got %T", newObj)
 	}
 	apisixConsumerLog.Info("Validation for ApisixConsumer upon update", "name", consumer.GetName(), "namespace", consumer.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, apisixConsumerLog, consumer) {
+	if !controller.MatchesIngressClass(v.Client, apisixConsumerLog, consumer, "") {
 		return nil, nil
 	}
 

internal/webhook/v1/apisixroute_webhook.go

@@ -63,7 +63,7 @@ func (v *ApisixRouteCustomValidator) ValidateCreate(ctx context.Context, obj run
 		return nil, fmt.Errorf("expected an ApisixRoute object but got %T", obj)
 	}
 	apisixRouteLog.Info("Validation for ApisixRoute upon creation", "name", route.GetName(), "namespace", route.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, apisixRouteLog, route) {
+	if !controller.MatchesIngressClass(v.Client, apisixRouteLog, route, "") {
 		return nil, nil
 	}
 
@@ -76,7 +76,7 @@ func (v *ApisixRouteCustomValidator) ValidateUpdate(ctx context.Context, oldObj,
 		return nil, fmt.Errorf("expected an ApisixRoute object for the newObj but got %T", newObj)
 	}
 	apisixRouteLog.Info("Validation for ApisixRoute upon update", "name", route.GetName(), "namespace", route.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, apisixRouteLog, route) {
+	if !controller.MatchesIngressClass(v.Client, apisixRouteLog, route, "") {
 		return nil, nil
 	}
 

internal/webhook/v1/apisixtls_webhook.go

@@ -63,7 +63,7 @@ func (v *ApisixTlsCustomValidator) ValidateCreate(ctx context.Context, obj runti
 		return nil, fmt.Errorf("expected an ApisixTls object but got %T", obj)
 	}
 	apisixTlsLog.Info("Validation for ApisixTls upon creation", "name", tls.GetName(), "namespace", tls.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, apisixTlsLog, tls) {
+	if !controller.MatchesIngressClass(v.Client, apisixTlsLog, tls, "") {
 		return nil, nil
 	}
 
@@ -76,7 +76,7 @@ func (v *ApisixTlsCustomValidator) ValidateUpdate(ctx context.Context, oldObj, n
 		return nil, fmt.Errorf("expected an ApisixTls object for the newObj but got %T", newObj)
 	}
 	apisixTlsLog.Info("Validation for ApisixTls upon update", "name", tls.GetName(), "namespace", tls.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, apisixTlsLog, tls) {
+	if !controller.MatchesIngressClass(v.Client, apisixTlsLog, tls, "") {
 		return nil, nil
 	}
 

internal/webhook/v1/ingress_webhook.go

@@ -138,7 +138,7 @@ func (v *IngressCustomValidator) ValidateCreate(ctx context.Context, obj runtime
 		return nil, fmt.Errorf("expected a Ingress object but got %T", obj)
 	}
 	ingresslog.Info("Validation for Ingress upon creation", "name", ingress.GetName(), "namespace", ingress.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, ingresslog, ingress) {
+	if !controller.MatchesIngressClass(v.Client, ingresslog, ingress, "") {
 		return nil, nil
 	}
 
@@ -156,7 +156,7 @@ func (v *IngressCustomValidator) ValidateUpdate(ctx context.Context, oldObj, new
 		return nil, fmt.Errorf("expected a Ingress object for the newObj but got %T", newObj)
 	}
 	ingresslog.Info("Validation for Ingress upon update", "name", ingress.GetName(), "namespace", ingress.GetNamespace())
-	if !controller.MatchesIngressClass(v.Client, ingresslog, ingress) {
+	if !controller.MatchesIngressClass(v.Client, ingresslog, ingress, "") {
 		return nil, nil
 	}