resolve comments

Author: dspo

internal/controller/gatewayproxy_controller.go

@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	v1 "sigs.k8s.io/gateway-api/apis/v1"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
 	"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
@@ -64,13 +64,18 @@ func (r *GatewayProxyController) SetupWithManager(mrg ctrl.Manager) error {
 }
 
 func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request) (reconcile.Result, error) {
+	var tctx = provider.NewDefaultTranslateContext(ctx)
+
 	var gp v1alpha1.GatewayProxy
 	if err := r.Get(ctx, req.NamespacedName, &gp); err != nil {
-		return ctrl.Result{}, client.IgnoreNotFound(err)
+		if client.IgnoreNotFound(err) == nil {
+			gp.Namespace = req.Namespace
+			gp.Name = req.Name
+			err = r.Provider.Update(ctx, tctx, &gp)
+		}
+		return ctrl.Result{}, err
 	}
 
-	var tctx = provider.NewDefaultTranslateContext(ctx)
-
 	// if there is no provider, update with empty translate context
 	if gp.Spec.Provider == nil || gp.Spec.Provider.ControlPlane == nil {
 		return reconcile.Result{}, r.Provider.Update(ctx, tctx, &gp)
@@ -108,7 +113,7 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 
 	// list Gateways that reference the GatewayProxy
 	var (
-		gatewayList      v1.GatewayList
+		gatewayList      gatewayv1.GatewayList
 		ingressClassList networkingv1.IngressClassList
 		indexKey         = indexer.GenIndexKey(gp.GetNamespace(), gp.GetName())
 	)
@@ -119,11 +124,11 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 
 	// list IngressClasses that reference the GatewayProxy
 	if err := r.List(ctx, &ingressClassList, client.MatchingFields{indexer.IngressClassParametersRef: indexKey}); err != nil {
-		r.Log.Error(err, "failed to list GatewayList")
+		r.Log.Error(err, "failed to list IngressClassList")
 		return reconcile.Result{}, err
 	}
 
-	// append referrers to tanslate context
+	// append referrers to translate context
 	for _, item := range gatewayList.Items {
 		tctx.GatewayProxyReferrers[req.NamespacedName] = append(tctx.GatewayProxyReferrers[req.NamespacedName], utils.NamespacedNameKind(&item))
 	}

internal/controller/indexer/indexer.go

@@ -245,7 +245,7 @@ func setupGatewayProxyIndexer(mgr ctrl.Manager) error {
 		context.Background(),
 		&v1alpha1.GatewayProxy{},
 		ServiceIndexRef,
-		GatewayProxyserviceIndexFunc,
+		GatewayProxyServiceIndexFunc,
 	); err != nil {
 		return err
 	}
@@ -281,7 +281,7 @@ func setupGatewayClassIndexer(mgr ctrl.Manager) error {
 	)
 }
 
-func GatewayProxyserviceIndexFunc(rawOjb client.Object) []string {
+func GatewayProxyServiceIndexFunc(rawOjb client.Object) []string {
 	gatewayProxy := rawOjb.(*v1alpha1.GatewayProxy)
 	if gatewayProxy.Spec.Provider != nil &&
 		gatewayProxy.Spec.Provider.ControlPlane != nil &&

test/e2e/crds/gatewayproxy.go

@@ -18,6 +18,7 @@
 package gatewayapi
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"time"
@@ -26,6 +27,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/utils/ptr"
 
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
@@ -137,18 +139,35 @@ spec:
 				Replicas: ptr.To(2),
 			})
 
-			// request every pod to check configuration effect
+			By("check pod ready")
+			err = wait.PollUntilContextTimeout(context.Background(), time.Second, 10*time.Second, true, func(ctx context.Context) (done bool, err error) {
+				pods := s.GetPods(s.Namespace(), "app.kubernetes.io/name=apisix")
+				if len(pods) != 2 {
+					return false, nil
+				}
+				for _, pod := range pods {
+					if pod.Status.PodIP == "" {
+						return false, nil
+					}
+				}
+				return true, nil
+			})
+			Expect(err).NotTo(HaveOccurred(), "check pods ready")
+
+			By("request every pod to check configuration effect")
 			pods := s.GetPods(s.Namespace(), "app.kubernetes.io/name=apisix")
 			for i, pod := range pods {
 				s.Logf("pod name: %s", pod.GetName())
 				tunnel := k8s.NewTunnel(s.KubeOpts(), k8s.ResourceTypePod, pod.GetName(), 9080+i, 9080)
 				err := tunnel.ForwardPortE(s.GinkgoT)
 				Expect(err).NotTo(HaveOccurred(), "forward pod: %s", pod.Name)
 
-				resp := scaffold.NewClient("http", tunnel.Endpoint()).
-					GET("/get").WithHost("httpbin.org").Expect()
-				resp.Status(http.StatusOK)
-				resp.Header("X-Pod-Hostname").IsEqual(pod.Name)
+				err = wait.PollUntilContextTimeout(context.Background(), time.Second, 30*time.Second, true, func(ctx context.Context) (done bool, err error) {
+					resp := scaffold.NewClient("http", tunnel.Endpoint()).
+						GET("/get").WithHost("httpbin.org").Expect().Raw()
+					return resp.StatusCode == http.StatusOK && resp.Header.Get("X-Pod-Hostname") == pod.GetName(), nil
+				})
+				Expect(err).NotTo(HaveOccurred(), "request the pod: %s", pod.GetName())
 
 				tunnel.Close()
 			}

test/e2e/scaffold/apisix_deployer.go

@@ -302,7 +302,10 @@ func (s *APISIXDeployer) createAdminTunnel(svc *corev1.Service) (*k8s.Tunnel, er
 	if err := adminTunnel.ForwardPortE(s.t); err != nil {
 		return nil, err
 	}
-	s.addFinalizers(adminTunnel.Close)
+	s.addFinalizers(func() {
+		adminTunnel.Close()
+		s.adminTunnel = nil
+	})
 
 	return adminTunnel, nil
 }

test/e2e/scaffold/scaffold.go

@@ -313,13 +313,19 @@ func (s *Scaffold) createDataplaneTunnels(
 	if err := httpTunnel.ForwardPortE(s.t); err != nil {
 		return nil, nil, err
 	}
-	s.addFinalizers(httpTunnel.Close)
+	s.addFinalizers(func() {
+		httpTunnel.Close()
+		s.apisixHttpTunnel = nil
+	})
 
 	if err := httpsTunnel.ForwardPortE(s.t); err != nil {
 		httpTunnel.Close()
 		return nil, nil, err
 	}
-	s.addFinalizers(httpsTunnel.Close)
+	s.addFinalizers(func() {
+		httpsTunnel.Close()
+		s.apisixHttpsTunnel = nil
+	})
 
 	return httpTunnel, httpsTunnel, nil
 }