fix lint

Author: AlinsRan

internal/controller/apisixconsumer_controller.go

@@ -44,6 +44,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
 	"github.com/apache/apisix-ingress-controller/internal/provider"
 	"github.com/apache/apisix-ingress-controller/internal/utils"
+	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
 // ApisixConsumerReconciler reconciles a ApisixConsumer object
@@ -171,7 +172,7 @@ func (r *ApisixConsumerReconciler) listApisixConsumerForGatewayProxy(ctx context
 }
 
 func (r *ApisixConsumerReconciler) listApisixConsumerForIngressClass(ctx context.Context, obj client.Object) []reconcile.Request {
-	ingressClass := convertIngressClass(obj)
+	ingressClass := pkgutils.ConvertToIngressClassV1(obj)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/apisixglobalrule_controller.go

@@ -41,6 +41,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
 	"github.com/apache/apisix-ingress-controller/internal/provider"
 	"github.com/apache/apisix-ingress-controller/internal/utils"
+	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
 // ApisixGlobalRuleReconciler reconciles a ApisixGlobalRule object
@@ -172,7 +173,7 @@ func (r *ApisixGlobalRuleReconciler) checkIngressClass(obj client.Object) bool {
 
 // listGlobalRulesForIngressClass list all global rules that use a specific ingress class
 func (r *ApisixGlobalRuleReconciler) listGlobalRulesForIngressClass(ctx context.Context, obj client.Object) []reconcile.Request {
-	ingressClass := convertIngressClass(obj)
+	ingressClass := pkgutils.ConvertToIngressClassV1(obj)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/apisixroute_controller.go

@@ -573,7 +573,7 @@ func (r *ApisixRouteReconciler) listApisixRoutesForSecret(ctx context.Context, o
 }
 
 func (r *ApisixRouteReconciler) listApisixRouteForIngressClass(ctx context.Context, object client.Object) (requests []reconcile.Request) {
-	ingressClass := convertIngressClass(object)
+	ingressClass := pkgutils.ConvertToIngressClassV1(object)
 
 	return ListMatchingRequests(
 		ctx,
@@ -652,7 +652,7 @@ func (r *ApisixRouteReconciler) listApisixRoutesForPluginConfig(ctx context.Cont
 			}
 			return nil
 		}
-		ic := convertIngressClass(icObj)
+		ic := pkgutils.ConvertToIngressClassV1(icObj)
 		if !matchesController(ic.Spec.Controller) {
 			return nil
 		}

internal/controller/apisixtls_controller.go

@@ -43,6 +43,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
 	"github.com/apache/apisix-ingress-controller/internal/provider"
 	"github.com/apache/apisix-ingress-controller/internal/utils"
+	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
 // ApisixTlsReconciler reconciles a ApisixTls object
@@ -272,7 +273,7 @@ func (r *ApisixTlsReconciler) listApisixTlsForSecret(ctx context.Context, obj cl
 
 // listApisixTlsForIngressClass list all TLS that use a specific ingress class
 func (r *ApisixTlsReconciler) listApisixTlsForIngressClass(ctx context.Context, obj client.Object) []reconcile.Request {
-	ingressClass := convertIngressClass(obj)
+	ingressClass := pkgutils.ConvertToIngressClassV1(obj)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/utils.go

@@ -1296,7 +1296,7 @@ func listIngressClassRequestsForGatewayProxy(
 }
 
 func matchesIngressController(obj client.Object) bool {
-	ingressClass := convertIngressClass(obj)
+	ingressClass := pkgutils.ConvertToIngressClassV1(obj)
 	return matchesController(ingressClass.Spec.Controller)
 }
 
@@ -1460,7 +1460,7 @@ func GetIngressClass(ctx context.Context, c client.Client, log logr.Logger, ingr
 		if err != nil {
 			return nil, err
 		}
-		return convertIngressClass(icBeta), nil
+		return pkgutils.ConvertToIngressClassV1(icBeta), nil
 	default:
 		return GetIngressClassv1(ctx, c, log, ingressClassName)
 	}
@@ -1571,30 +1571,6 @@ func MatchConsumerGatewayRef(ctx context.Context, c client.Client, log logr.Logg
 	return matchesController(string(gatewayClass.Spec.ControllerName))
 }
 
-func convertIngressClass(obj client.Object) *networkingv1.IngressClass {
-	switch t := obj.(type) {
-	case *networkingv1beta1.IngressClass:
-		icv1 := &networkingv1.IngressClass{
-			TypeMeta:   t.TypeMeta,
-			ObjectMeta: t.ObjectMeta,
-			Spec: networkingv1.IngressClassSpec{
-				Controller: t.Spec.Controller,
-				Parameters: &networkingv1.IngressClassParametersReference{
-					APIGroup: t.Spec.Parameters.APIGroup,
-					Kind:     t.Spec.Parameters.Kind,
-					Name:     t.Spec.Parameters.Name,
-				},
-			},
-		}
-		icv1.APIVersion = networkingv1.SchemeGroupVersion.String()
-		return icv1
-	case *networkingv1.IngressClass:
-		return t
-	default:
-		panic(fmt.Sprintf("unexpected type %T for IngressClass", t))
-	}
-}
-
 func GetIngressClassName(obj client.Object) string {
 	switch t := obj.(type) {
 	case *networkingv1.Ingress:

internal/provider/adc/adc.go

@@ -31,6 +31,7 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	networkingv1 "k8s.io/api/networking/v1"
+	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
@@ -45,6 +46,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/internal/types"
 	"github.com/apache/apisix-ingress-controller/internal/utils"
 	pkgmetrics "github.com/apache/apisix-ingress-controller/pkg/metrics"
+	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
 type adcConfig struct {
@@ -152,6 +154,10 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 	case *networkingv1.IngressClass:
 		result, err = d.translator.TranslateIngressClass(tctx, t.DeepCopy())
 		resourceTypes = append(resourceTypes, "global_rule", "plugin_metadata")
+	case *networkingv1beta1.IngressClass:
+		cp := pkgutils.ConvertToIngressClassV1(t.DeepCopy())
+		result, err = d.translator.TranslateIngressClass(tctx, cp)
+		resourceTypes = append(resourceTypes, "global_rule", "plugin_metadata")
 	case *apiv2.ApisixRoute:
 		result, err = d.translator.TranslateApisixRoute(tctx, t.DeepCopy())
 		resourceTypes = append(resourceTypes, "service")
@@ -257,7 +263,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 	case *v1alpha1.Consumer:
 		resourceTypes = append(resourceTypes, "consumer")
 		labels = label.GenLabel(obj)
-	case *networkingv1.IngressClass:
+	case *networkingv1.IngressClass, *networkingv1beta1.IngressClass:
 		// delete all resources
 	case *apiv2.ApisixGlobalRule:
 		resourceTypes = append(resourceTypes, "global_rule")

pkg/utils/cluster.go

@@ -18,7 +18,11 @@
 package utils
 
 import (
+	"fmt"
+
 	"github.com/go-logr/logr"
+	networkingv1 "k8s.io/api/networking/v1"
+	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 	"k8s.io/client-go/discovery"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -69,7 +73,6 @@ func HasAPIResourceWithLogger(mgr ctrl.Manager, obj client.Object, logger logr.L
 	// Check if the specific kind exists in the resource list
 	for _, res := range apiResources.APIResources {
 		if res.Kind == gvk.Kind {
-			logger.Info("API resource kind found in group/version", "kind", res.Kind)
 			return true
 		}
 	}
@@ -82,3 +85,27 @@ func FormatGVK(obj client.Object) string {
 	gvk := types.GvkOf(obj)
 	return gvk.String()
 }
+
+func ConvertToIngressClassV1(obj client.Object) *networkingv1.IngressClass {
+	switch t := obj.(type) {
+	case *networkingv1beta1.IngressClass:
+		icv1 := &networkingv1.IngressClass{
+			TypeMeta:   t.TypeMeta,
+			ObjectMeta: t.ObjectMeta,
+			Spec: networkingv1.IngressClassSpec{
+				Controller: t.Spec.Controller,
+				Parameters: &networkingv1.IngressClassParametersReference{
+					APIGroup: t.Spec.Parameters.APIGroup,
+					Kind:     t.Spec.Parameters.Kind,
+					Name:     t.Spec.Parameters.Name,
+				},
+			},
+		}
+		icv1.APIVersion = networkingv1.SchemeGroupVersion.String()
+		return icv1
+	case *networkingv1.IngressClass:
+		return t
+	default:
+		panic(fmt.Sprintf("unexpected type %T for IngressClass", t))
+	}
+}

test/e2e/framework/api7_framework.go

@@ -155,9 +155,6 @@ func (f *Framework) deploy() {
 
 	err = f.ensureService("api7-postgresql", _namespace, 1)
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring postgres service")
-
-	//err = f.ensureService("api7-prometheus-server", _namespace, 1)
-	//f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring prometheus-server service")
 }
 
 func (f *Framework) initDashboard() {