fix: r

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

Author: ronething

internal/controller/gatewayproxy_controller.go

@@ -113,6 +113,11 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 			Namespace: gp.Namespace,
 			Name:      providerService.Name,
 		}
+		service := &corev1.Service{}
+		if err := r.Get(ctx, serviceNN, service); err != nil {
+			return reconcile.Result{}, err
+		}
+		tctx.Services[serviceNN] = service
 		if err := collectEndpointsWithEndpointSliceSupport(tctx, r.Client, tctx, serviceNN, r.supportsEndpointSlice, nil); err != nil {
 			return reconcile.Result{}, err
 		}

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -168,20 +168,16 @@ spec:
 
 			By("scale apisix to replicas 2")
 			s.Deployer.DeployDataplane(scaffold.DeployDataplaneOptions{
-				Replicas: ptr.To(2),
+				Replicas:          ptr.To(2),
+				SkipCreateTunnels: true,
 			})
 
 			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 {
+			err = wait.PollUntilContextTimeout(context.Background(), time.Second, 60*time.Second, true, func(ctx context.Context) (done bool, err error) {
+				endpoints := s.GetEndpoints(s.Namespace(), framework.ProviderType)
+				if len(endpoints.Subsets) != 1 || len(endpoints.Subsets[0].Addresses) != 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")

test/e2e/framework/k8s.go

@@ -215,6 +215,12 @@ func (f *Framework) GetPods(namespace, selector string) []corev1.Pod {
 	return podList.Items
 }
 
+func (f *Framework) GetEndpoints(namespace, name string) *corev1.Endpoints {
+	endpoints, err := f.clientset.CoreV1().Endpoints(cmp.Or(namespace, _namespace)).Get(f.Context, name, metav1.GetOptions{})
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred())
+	return endpoints
+}
+
 func (f *Framework) applySSLSecret(namespace, name string, cert, pkey, caCert []byte) {
 	kind := "Secret"
 	apiVersion := "v1"