fix: r

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

Author: ronething

internal/adc/translator/apisixroute.go

@@ -72,8 +72,9 @@ func (t *Translator) translateHTTPRule(tctx *provider.TranslateContext, ar *apiv
 
 	var enableWebsocket *bool
 	service := t.buildService(ar, rule, ruleIndex)
-	t.buildRoute(ar, service, rule, plugins, timeout, vars, &enableWebsocket)
+	// should build upstream before route because route needs to know the enableWebsocket flag
 	t.buildUpstream(tctx, service, ar, rule, ruleIndex, &enableWebsocket)
+	t.buildRoute(ar, service, rule, plugins, timeout, vars, &enableWebsocket)
 
 	return service, nil
 }

test/e2e/crds/v2/route.go

@@ -2319,9 +2319,8 @@ spec:
 
 			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"},
 				new(apiv2.ApisixRoute), fmt.Sprintf(apisixRouteWithBackendWSS, s.Namespace()))
-			time.Sleep(6 * time.Second)
 
-			By("verify wss connection")
+			By("verify wss connection with retry")
 			u := url.URL{
 				Scheme: "wss",
 				Host:   s.GetAPISIXHTTPSEndpoint(),
@@ -2335,8 +2334,13 @@ spec:
 				},
 			}
 
-			conn, resp, err := dialer.Dial(u.String(), headers)
-			Expect(err).ShouldNot(HaveOccurred(), "WebSocket handshake")
+			var conn *websocket.Conn
+			var resp *http.Response
+			Eventually(func() error {
+				var dialErr error
+				conn, resp, dialErr = dialer.Dial(u.String(), headers)
+				return dialErr
+			}).WithTimeout(30*time.Second).WithPolling(2*time.Second).Should(Succeed(), "WebSocket handshake should succeed")
 			Expect(resp.StatusCode).Should(Equal(http.StatusSwitchingProtocols))
 
 			defer func() {