Merge remote-tracking branch 'origin/master' into backport/ingress_port_name

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

@@ -2285,6 +2285,9 @@ spec:
     namespace: %s
 `
 		BeforeEach(func() {
+			if framework.IngressVersion != "v1" {
+				Skip("skipping test in non-v1 ingress version")
+			}
 			s.DeployNginx(framework.NginxOptions{
 				Namespace: s.Namespace(),
 				Replicas:  ptr.To(int32(1)),
@@ -2319,9 +2322,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 +2337,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() {

test/e2e/framework/manifests/nginx.yaml

@@ -143,17 +143,23 @@ spec:
       port: 443
       protocol: TCP
       targetPort: 443
+      {{ if eq .IngressVersion "v1" }}
       appProtocol: https
+      {{ end }}
     - name: ws
       port: 8080
       protocol: TCP
       targetPort: 80
+      {{ if eq .IngressVersion "v1" }}
       appProtocol: kubernetes.io/ws
+      {{ end }}
     - name: wss
       port: 8443
       protocol: TCP
       targetPort: 443
+      {{ if eq .IngressVersion "v1" }}
       appProtocol: kubernetes.io/wss
+      {{ end }}
   type: ClusterIP
 ---
 apiVersion: v1

test/e2e/framework/nginx.go

@@ -36,8 +36,9 @@ var (
 )
 
 type NginxOptions struct {
-	Namespace string
-	Replicas  *int32
+	Namespace      string
+	Replicas       *int32
+	IngressVersion string
 }
 
 func init() {
@@ -51,6 +52,7 @@ func init() {
 func (f *Framework) DeployNginx(opts NginxOptions) *corev1.Service {
 	buf := bytes.NewBuffer(nil)
 
+	opts.IngressVersion = IngressVersion
 	err := ngxSpecTpl.Execute(buf, opts)
 	f.GomegaT.Expect(err).ToNot(HaveOccurred(), "rendering nginx spec")
 

test/e2e/gatewayapi/httproute.go

@@ -2486,6 +2486,9 @@ spec:
 		)
 
 		BeforeEach(func() {
+			if framework.IngressVersion != "v1" {
+				Skip("skipping test in non-v1 ingress version")
+			}
 			beforeEachHTTPS()
 			s.DeployNginx(framework.NginxOptions{
 				Namespace: s.Namespace(),
@@ -2523,8 +2526,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() {
@@ -2533,7 +2541,7 @@ spec:
 
 			By("send and receive message through WebSocket")
 			testMessage := "hello, this is APISIX"
-			err = conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
+			err := conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
 			Expect(err).ShouldNot(HaveOccurred(), "writing WebSocket message")
 
 			// Then our echo

test/e2e/ingress/ingress.go

@@ -1089,6 +1089,9 @@ spec:
               number: 8443
 `
 		BeforeEach(func() {
+			if framework.IngressVersion != "v1" {
+				Skip("skipping test in non-v1 ingress version")
+			}
 			s.DeployNginx(framework.NginxOptions{
 				Namespace: s.Namespace(),
 				Replicas:  ptr.To(int32(1)),
@@ -1134,8 +1137,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() {
@@ -1144,7 +1152,7 @@ spec:
 
 			By("send and receive message through WebSocket")
 			testMessage := "hello, this is APISIX"
-			err = conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
+			err := conn.WriteMessage(websocket.TextMessage, []byte(testMessage))
 			Expect(err).ShouldNot(HaveOccurred(), "writing WebSocket message")
 
 			// Then our echo