fix: review

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

Author: ronething

internal/controller/config/config.go

@@ -174,3 +174,7 @@ func GetIngressPublishService() string {
 func GetIngressStatusAddress() []string {
 	return ControllerConfig.IngressStatusAddress
 }
+
+func GetControllerName() string {
+	return ControllerConfig.ControllerName
+}

internal/controller/indexer/indexer.go

@@ -16,6 +16,7 @@ const (
 	ParentRefs      = "parentRefs"
 	IngressClass    = "ingressClass"
 	SecretIndexRef  = "secretRefs"
+	IngressClassRef = "ingressClassRef"
 )
 
 func SetupIndexer(mgr ctrl.Manager) error {
@@ -78,8 +79,8 @@ func setupIngressIndexer(mgr ctrl.Manager) error {
 	if err := mgr.GetFieldIndexer().IndexField(
 		context.Background(),
 		&networkingv1.Ingress{},
-		IngressClass,
-		IngressClassIndexFunc,
+		IngressClassRef,
+		IngressClassRefIndexFunc,
 	); err != nil {
 		return err
 	}
@@ -104,10 +105,29 @@ func setupIngressIndexer(mgr ctrl.Manager) error {
 		return err
 	}
 
+	// create IngressClass index
+	if err := mgr.GetFieldIndexer().IndexField(
+		context.Background(),
+		&networkingv1.IngressClass{},
+		IngressClass,
+		IngressClassIndexFunc,
+	); err != nil {
+		return err
+	}
+
 	return nil
 }
 
 func IngressClassIndexFunc(rawObj client.Object) []string {
+	ingressClass := rawObj.(*networkingv1.IngressClass)
+	if ingressClass.Spec.Controller == "" {
+		return nil
+	}
+	controllerName := ingressClass.Spec.Controller
+	return []string{controllerName}
+}
+
+func IngressClassRefIndexFunc(rawObj client.Object) []string {
 	ingress := rawObj.(*networkingv1.Ingress)
 	if ingress.Spec.IngressClassName == nil {
 		return nil

internal/controller/ingress_controller.go

@@ -24,10 +24,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;update
-// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses/status,verbs=get;update
-// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingressclasses,verbs=get;list;watch
-
 // IngressReconciler reconciles a Ingress object.
 type IngressReconciler struct { //nolint:revive
 	client.Client
@@ -128,7 +124,9 @@ func (r *IngressReconciler) checkIngressClass(obj client.Object) bool {
 		// handle the case where IngressClassName is not specified
 		// find all ingress classes and check if any of them is marked as default
 		ingressClassList := &networkingv1.IngressClassList{}
-		if err := r.List(context.Background(), ingressClassList); err != nil {
+		if err := r.List(context.Background(), ingressClassList, client.MatchingFields{
+			indexer.IngressClass: config.GetControllerName(),
+		}); err != nil {
 			r.Log.Error(err, "failed to list ingress classes")
 			return false
 		}
@@ -310,7 +308,10 @@ func (r *IngressReconciler) processBackendService(ctx context.Context, tctx *pro
 		Namespace: namespace,
 		Name:      backendService.Name,
 	}, &service); err != nil {
-		r.Log.Error(err, "failed to get service", "namespace", namespace, "name", backendService.Name)
+		if client.IgnoreNotFound(err) == nil {
+			r.Log.Info("service not found", "namespace", namespace, "name", backendService.Name)
+			return nil
+		}
 		return err
 	}
 
@@ -392,8 +393,7 @@ func (r *IngressReconciler) updateStatus(ctx context.Context, ingress *networkin
 				return fmt.Errorf("failed to get publish service %s: %w", publishService, err)
 			}
 
-			if svc.Spec.Type != corev1.ServiceTypeLoadBalancer {
-				r.Log.Error(fmt.Errorf("publish service %s is not a load balancer service", publishService), "publish service is not a load balancer service")
+			if svc.Spec.Type == corev1.ServiceTypeLoadBalancer {
 				// get the LoadBalancer IP and Hostname of the service
 				for _, ip := range svc.Status.LoadBalancer.Ingress {
 					if ip.IP != "" {
@@ -408,20 +408,6 @@ func (r *IngressReconciler) updateStatus(ctx context.Context, ingress *networkin
 					}
 				}
 			}
-
-		} else {
-			// 3. if the PublishService is not configured, try to use the Gateway's Addresses
-			cfg := config.GetFirstGatewayConfig()
-			if cfg != nil {
-				for _, addr := range cfg.Addresses {
-					if addr == "" {
-						continue
-					}
-					loadBalancerStatus.Ingress = append(loadBalancerStatus.Ingress, networkingv1.IngressLoadBalancerIngress{
-						IP: addr,
-					})
-				}
-			}
 		}
 	}
 

internal/manager/controllers.go

@@ -33,6 +33,11 @@ import (
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=httproutes,verbs=get;list;watch
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=httproutes/status,verbs=get;update
 
+// Networking
+// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;update
+// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses/status,verbs=get;update
+// +kubebuilder:rbac:groups=networking.k8s.io,resources=ingressclasses,verbs=get;list;watch
+
 type Controller interface {
 	SetupWithManager(mgr manager.Manager) error
 }

test/e2e/framework/consts.go

@@ -6,17 +6,17 @@ import (
 )
 
 const (
-	DashboardEndpoint           = "http://api7ee3-dashboard.api7-ee-e2e:7080"
-	DashboardTLSEndpoint        = "https://api7ee3-dashboard.api7-ee-e2e:7443"
+	DashboardEndpoint           = "http://api7ee3-dashboard.api7-ee-e2e-test:7080"
+	DashboardTLSEndpoint        = "https://api7ee3-dashboard.api7-ee-e2e-test:7443"
 	DataPlaneEndpoint           = "http://api7ee3-apisix-gateway:80"         // has two instances
 	DataPlaneForIngressEndpoint = "http://api7ee3-apisix-gateway-ingress:80" // only one instances
 	DataPlaneForIngressHost     = "api7ee3-apisix-gateway-ingress"
 	DataPlaneTcpPort            = 9100
 	MTLSDataPlaneHost           = "api7ee3-apisix-gateway-mtls"
 	MTLSDataPlaneEndpoint       = "http://api7ee3-apisix-gateway-mtls:80" // only one instance
 	PrometheusEndpoint          = "http://api7-prometheus-server:9090"
-	DPManagerEndpoint           = "http://api7ee3-dp-manager.api7-ee-e2e:7900"
-	DPManagerTLSEndpoint        = "https://api7ee3-dp-manager.api7-ee-e2e:7943"
+	DPManagerEndpoint           = "http://api7ee3-dp-manager.api7-ee-e2e-test:7900"
+	DPManagerTLSEndpoint        = "https://api7ee3-dp-manager.api7-ee-e2e-test:7943"
 	VaultEndpoint               = "http://api7ee3-vault:8200"
 	KeycloakEndpoint            = "http://api7ee3-keycloak:80"
 )

test/e2e/framework/framework.go

@@ -20,7 +20,7 @@ import (
 )
 
 var (
-	_namespace = "api7-ee-e2e"
+	_namespace = "api7-ee-e2e-test"
 	_framework *Framework
 )
 

test/e2e/framework/manifests/ingress.yaml

@@ -184,6 +184,30 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -360,4 +384,4 @@ spec:
         configMap:
           name: ingress-config
       serviceAccountName: api7-ingress-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10