fix: r

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

Author: ronething

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
+	github.com/gorilla/websocket v1.5.1
 	github.com/gruntwork-io/terratest v0.47.0
 	github.com/hashicorp/go-memdb v1.3.4
 	github.com/hashicorp/go-multierror v1.1.1
@@ -106,7 +107,6 @@ require (
 	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect

test/e2e/crds/v2/route.go

@@ -25,6 +25,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -755,6 +756,12 @@ spec:
 	})
 
 	Context("Test ApisixRoute Traffic Split", func() {
+		BeforeEach(func() {
+			s.DeployNginx(framework.NginxOptions{
+				Namespace: s.Namespace(),
+			})
+		})
+
 		It("2:1 traffic split test", func() {
 			const apisixRouteSpec = `
 apiVersion: apisix.apache.org/v2
@@ -774,20 +781,16 @@ spec:
    - serviceName: httpbin-service-e2e-test
      servicePort: 80
      weight: 10
-   - serviceName: %s
-     servicePort: 9180
+   - serviceName: nginx
+     servicePort: 80
      weight: 5
 `
 			By("apply ApisixRoute with traffic split")
-			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute),
-				fmt.Sprintf(apisixRouteSpec, s.Deployer.GetAdminServiceName()))
-			verifyRequest := func() int {
-				return s.NewAPISIXClient().GET("/get").WithHost("httpbin.org").Expect().Raw().StatusCode
-			}
+			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute), apisixRouteSpec)
 			By("send requests to verify traffic split")
 			var (
-				successCount int
-				failCount    int
+				hitHttpbinCnt = 0
+				hitNginxCnt   = 0
 			)
 
 			s.RequestAssert(&scaffold.RequestAssert{
@@ -798,16 +801,18 @@ spec:
 				Timeout: 10 * time.Second,
 			})
 			for range 90 {
-				code := verifyRequest()
-				if code == http.StatusOK {
-					successCount++
+				resp := s.NewAPISIXClient().GET("/get").WithHost("httpbin.org").Expect()
+				body := resp.Body().Raw()
+
+				if strings.Contains(body, "Hello") {
+					hitNginxCnt++
 				} else {
-					failCount++
+					hitHttpbinCnt++
 				}
 			}
 
 			By("verify traffic distribution ratio")
-			ratio := float64(successCount) / float64(failCount)
+			ratio := float64(hitHttpbinCnt) / float64(hitNginxCnt)
 			expectedRatio := 10.0 / 5.0 // 2:1 ratio
 			deviation := math.Abs(ratio - expectedRatio)
 			Expect(deviation).Should(BeNumerically("<", 0.5),
@@ -838,8 +843,7 @@ spec:
      weight: 0
 `
 			By("apply ApisixRoute with zero-weight backend")
-			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute),
-				fmt.Sprintf(apisixRouteSpec, s.Deployer.GetAdminServiceName()))
+			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute), apisixRouteSpec)
 			verifyRequest := func() int {
 				return s.NewAPISIXClient().GET("/get").WithHost("httpbin.org").Expect().Raw().StatusCode
 			}

test/e2e/scaffold/apisix_deployer.go

@@ -420,9 +420,6 @@ func (s *APISIXDeployer) GetAdminEndpoint(svc ...*corev1.Service) string {
 	return fmt.Sprintf("http://%s.%s:9180", svc[0].Name, svc[0].Namespace)
 }
 
-func (s *APISIXDeployer) GetAdminServiceName() string {
-	return s.dataplaneService.Name
-}
 func (s *APISIXDeployer) DefaultDataplaneResource() DataplaneResource {
 	return newADCDataplaneResource(
 		framework.ProviderType,

test/e2e/scaffold/deployer.go

@@ -32,7 +32,6 @@ type Deployer interface {
 	CreateAdditionalGateway(namePrefix string) (string, *corev1.Service, error)
 	CleanupAdditionalGateway(identifier string) error
 	GetAdminEndpoint(...*corev1.Service) string
-	GetAdminServiceName() string
 	DefaultDataplaneResource() DataplaneResource
 	Name() string
 }