resolve comments

Author: AlinsRan

internal/controller/ingressclass_v1beta1_controller.go

@@ -187,13 +187,16 @@ func (r *IngressClassV1beta1Reconciler) processInfrastructure(tctx *provider.Tra
 		return nil
 	}
 
+	// Since v1beta1 does not support specifying the target namespace,
+	// and GatewayProxy is a namespace-scoped resource, we default to using
+	// the "default" namespace for convenience.
 	namespace := "default"
 	if IngressClassV1beta1.Spec.Parameters.Namespace != nil {
 		namespace = *IngressClassV1beta1.Spec.Parameters.Namespace
 	}
 
 	gatewayProxy := new(v1alpha1.GatewayProxy)
-	if err := r.Get(context.Background(), client.ObjectKey{
+	if err := r.Get(tctx, client.ObjectKey{
 		Namespace: namespace,
 		Name:      IngressClassV1beta1.Spec.Parameters.Name,
 	}, gatewayProxy); err != nil {
@@ -212,7 +215,7 @@ func (r *IngressClassV1beta1Reconciler) processInfrastructure(tctx *provider.Tra
 			if auth.AdminKey.ValueFrom.SecretKeyRef != nil {
 				secretRef := auth.AdminKey.ValueFrom.SecretKeyRef
 				secret := &corev1.Secret{}
-				if err := r.Get(context.Background(), client.ObjectKey{
+				if err := r.Get(tctx, client.ObjectKey{
 					Namespace: namespace,
 					Name:      secretRef.Name,
 				}, secret); err != nil {

internal/controller/utils.go

@@ -41,7 +41,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	k8stypes "k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -1571,16 +1570,6 @@ func MatchConsumerGatewayRef(ctx context.Context, c client.Client, log logr.Logg
 	return matchesController(string(gatewayClass.Spec.ControllerName))
 }
 
-func GetIngressClassName(obj client.Object) string {
-	switch t := obj.(type) {
-	case *networkingv1.Ingress:
-		return ptr.Deref(t.Spec.IngressClassName, "")
-	case *networkingv1beta1.IngressClass:
-		return ""
-	}
-	return ""
-}
-
 // watchEndpointSliceOrEndpoints adds watcher for EndpointSlice or Endpoints based on cluster API support
 func watchEndpointSliceOrEndpoints(bdr *ctrl.Builder, supportsEndpointSlice bool, endpointSliceMapFunc, endpointsMapFunc handler.MapFunc, log logr.Logger) *ctrl.Builder {
 	if supportsEndpointSlice {

internal/manager/controllers.go

@@ -257,7 +257,7 @@ func registerV2ForReadinessGVK(mgr manager.Manager, readier readiness.ReadinessM
 		types.GvkOf(&apiv2.ApisixConsumer{}),
 	}
 	if utils.HasAPIResource(mgr, &netv1.Ingress{}) {
-		gvks = append(gvks, types.GvkOf(&netv1.IngressClass{}))
+		gvks = append(gvks, types.GvkOf(&netv1.Ingress{}))
 	}
 
 	c := mgr.GetClient()