fix: r

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

Author: ronething

.github/workflows/e2e-test-k8s.yml

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: E2E Test For Kubernetes
+name: API7EE E2E Test For Kubernetes 1.18
 
 on:
   push:

.github/workflows/e2e-test.yml

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: E2E Test
+name: API7EE E2E Test
 
 on:
   push:
@@ -29,32 +29,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Go Env
-        id: go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.23"
-
-      - name: Install kind
-        run: |
-          go install sigs.k8s.io/[email protected]
-
-      - name: Install Helm
-        run: |
-          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh
-
   e2e-test:
-    needs: 
-      - prepare
     strategy:
       matrix:
         cases_subset:
@@ -73,6 +48,15 @@ jobs:
         with:
           go-version: "1.23"
 
+      - name: Install kind
+        run: |
+          go install sigs.k8s.io/[email protected]
+
+      - name: Install Helm
+        run: |
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
       - name: Login to Registry
         uses: docker/login-action@v3
         with:

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -40,8 +40,7 @@ var _ = Describe("Test GatewayProxy", Label("apisix.apache.org", "v1alpha1", "ga
 		err error
 	)
 
-	// TODO: change E2E
-	const gatewayProxySpecAPI7 = `
+	const gatewayProxySpec = `
 apiVersion: apisix.apache.org/v1alpha1
 kind: GatewayProxy
 metadata:
@@ -50,8 +49,9 @@ spec:
   provider:
     type: ControlPlane
     controlPlane:
-      endpoints:
-      - %s
+      service:
+        name: %s
+        port: 9180
       auth:
         type: AdminKey
         adminKey:
@@ -64,31 +64,29 @@ spec:
         "X-Pod-Hostname": "$hostname"
 `
 
-	const gatewayClassSpec = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: GatewayClass
-metadata:
-  name: %s
-spec:
-  controllerName: %s
-`
-	const gatewaySpec = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
+	const gatewayProxySpecAPI7 = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: GatewayProxy
 metadata:
-  name: %s
+  name: apisix-proxy-config
 spec:
-  gatewayClassName: %s
-  listeners:
-    - name: http1
-      protocol: HTTP
-      port: 80
-  infrastructure:
-    parametersRef:
-      group: apisix.apache.org
-      kind: GatewayProxy
-      name: apisix-proxy-config
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+  plugins:
+  - name: response-rewrite
+    enabled: true
+    config: 
+      headers:
+        "X-Pod-Hostname": "$hostname"
 `
+
 	const httpRouteSpec = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
@@ -109,30 +107,6 @@ spec:
       port: 80
 `
 
-	const gatewayProxySpec = `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: apisix-proxy-config
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      service:
-        name: %s
-        port: 9180
-      auth:
-        type: AdminKey
-        adminKey:
-          value: "%s"
-  plugins:
-  - name: response-rewrite
-    enabled: true
-    config: 
-      headers:
-        "X-Pod-Hostname": "$hostname"
-`
-
 	BeforeEach(func() {
 		gatewayName := s.Namespace()
 		By("create GatewayProxy")
@@ -141,21 +115,18 @@ spec:
 		} else {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpec, framework.ProviderType, s.AdminKey()))
 		}
-		gatewayProxy := fmt.Sprintf(gatewayProxySpec, framework.ProviderType, s.AdminKey())
-		err = s.CreateResourceFromString(gatewayProxy)
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
-		time.Sleep(time.Second)
+		time.Sleep(5 * time.Second)
 
 		By("create GatewayClass")
-		gatewayClassName := s.Namespace()
-		err = s.CreateResourceFromString(fmt.Sprintf(gatewayClassSpec, gatewayClassName, s.GetControllerName()))
+		err = s.CreateResourceFromString(s.GetGatewayClassYaml())
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
-		time.Sleep(time.Second)
+		time.Sleep(5 * time.Second)
 
 		By("create Gateway")
-		err = s.CreateResourceFromString(fmt.Sprintf(gatewaySpec, gatewayName, gatewayClassName))
+		err = s.CreateResourceFromString(s.GetGatewayYaml())
 		Expect(err).NotTo(HaveOccurred(), "creating Gateway")
-		time.Sleep(time.Second)
+		time.Sleep(5 * time.Second)
 
 		By("create HTTPRoute")
 		s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(httpRouteSpec, gatewayName))
@@ -213,10 +184,10 @@ spec:
 				keyword string
 			)
 
-			if framework.ProviderType == framework.ProviderTypeAPISIX {
-				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["%s"]}`, s.Deployer.GetAdminEndpoint())
-			} else {
+			if framework.ProviderType == framework.ProviderTypeAPISIXStandalone {
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["http://%s:9180"]}`, s.GetPodIP(s.Namespace(), "app.kubernetes.io/name=apisix"))
+			} else {
+				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["%s"]}`, s.Deployer.GetAdminEndpoint())
 			}
 
 			By(fmt.Sprintf("wait for keyword: %s", keyword))

test/e2e/crds/v2/route.go

@@ -1386,7 +1386,6 @@ spec:
 			It("should be able to use backends and upstreams together", func() {
 				upstreamName := s.Namespace()
 				routeName := s.Namespace()
-				// TODO: change ingressClassName
 				upstreamSpec := `
 apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream

test/e2e/gatewayapi/httproute.go

@@ -40,27 +40,6 @@ import (
 var _ = Describe("Test HTTPRoute", Label("networking.k8s.io", "httproute"), func() {
 	s := scaffold.NewDefaultScaffold()
 
-	var gatewayProxyYaml = `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: %s
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      service:
-        name: %s
-        port: 9180
-      auth:
-        type: AdminKey
-        adminKey:
-          value: "%s"
-`
-	getGatewayProxySpec := func() string {
-		return fmt.Sprintf(gatewayProxyYaml, s.Namespace(), framework.ProviderType, s.AdminKey())
-	}
-
 	var gatewayClassYaml = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
@@ -70,23 +49,6 @@ spec:
   controllerName: %s
 `
 
-	var defaultGateway = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: %s
-spec:
-  gatewayClassName: %s
-  listeners:
-    - name: http1
-      protocol: HTTP
-      port: 80
-  infrastructure:
-    parametersRef:
-      group: apisix.apache.org
-      kind: GatewayProxy
-      name: %s
-`
 	var defaultGatewayHTTPS = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
@@ -108,19 +70,18 @@ spec:
     parametersRef:
       group: apisix.apache.org
       kind: GatewayProxy
-      name: %s
+      name: apisix-proxy-config
 `
 
 	var beforeEachHTTP = func() {
-		Expect(s.CreateResourceFromStringWithNamespace(getGatewayProxySpec(), s.Namespace())).
-			NotTo(HaveOccurred(), "creating GatewayProxy")
+		By("create GatewayProxy")
+		Expect(s.CreateResourceFromString(s.GetGatewayProxySpec())).NotTo(HaveOccurred(), "creating GatewayProxy")
 
-		gatewayClassName := s.Namespace()
-		Expect(s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")).
-			NotTo(HaveOccurred(), "creating GatewayClass")
+		By("create GatewayClass")
+		Expect(s.CreateResourceFromString(s.GetGatewayClassYaml())).NotTo(HaveOccurred(), "creating GatewayClass")
 
 		s.RetryAssertion(func() string {
-			gcyaml, _ := s.GetResourceYaml("GatewayClass", gatewayClassName)
+			gcyaml, _ := s.GetResourceYaml("GatewayClass", s.Namespace())
 			return gcyaml
 		}).Should(
 			And(
@@ -129,12 +90,11 @@ spec:
 			),
 			"check GatewayClass condition",
 		)
-		gatewayName := s.Namespace()
-		Expect(s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName, s.Namespace()), s.Namespace())).
-			NotTo(HaveOccurred(), "creating Gateway")
+
+		Expect(s.CreateResourceFromString(s.GetGatewayYaml())).NotTo(HaveOccurred(), "creating Gateway")
 
 		s.RetryAssertion(func() string {
-			gcyaml, _ := s.GetResourceYaml("Gateway", gatewayName)
+			gcyaml, _ := s.GetResourceYaml("Gateway", s.Namespace())
 			return gcyaml
 		}).Should(
 			And(
@@ -147,19 +107,17 @@ spec:
 
 	var beforeEachHTTPS = func() {
 		By("create GatewayProxy")
-		err := s.CreateResourceFromStringWithNamespace(getGatewayProxySpec(), s.Namespace())
+		err := s.CreateResourceFromString(s.GetGatewayProxySpec())
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 
 		secretName := _secretName
 		createSecret(s, secretName)
 
 		By("create GatewayClass")
-		gatewayClassName := s.Namespace()
-		Expect(s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")).
-			NotTo(HaveOccurred(), "creating GatewayClass")
+		Expect(s.CreateResourceFromString(s.GetGatewayClassYaml())).NotTo(HaveOccurred(), "creating GatewayClass")
 
 		s.RetryAssertion(func() string {
-			gcyaml, _ := s.GetResourceYaml("GatewayClass", gatewayClassName)
+			gcyaml, _ := s.GetResourceYaml("GatewayClass", s.Namespace())
 			return gcyaml
 		}).Should(
 			And(
@@ -170,12 +128,11 @@ spec:
 		)
 
 		By("create Gateway")
-		gatewayName := s.Namespace()
-		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGatewayHTTPS, gatewayName, gatewayClassName, s.Namespace()), s.Namespace())
+		err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayHTTPS, s.Namespace(), s.Namespace()))
 		Expect(err).NotTo(HaveOccurred(), "creating Gateway")
 
 		s.RetryAssertion(func() string {
-			gcyaml, _ := s.GetResourceYaml("Gateway", gatewayName)
+			gcyaml, _ := s.GetResourceYaml("Gateway", s.Namespace())
 			return gcyaml
 		}).Should(
 			And(
@@ -1853,7 +1810,7 @@ spec:
 apiVersion: apisix.apache.org/v1alpha1
 kind: GatewayProxy
 metadata:
-  name: %s
+  name: apisix-proxy-config
 spec:
   provider:
     type: ControlPlane
@@ -1905,8 +1862,8 @@ spec:
 			})
 
 			By("update GatewayProxy with new admin key")
-			updatedProxy := fmt.Sprintf(updatedGatewayProxy, s.Namespace(), s.Deployer.GetAdminEndpoint(resources.DataplaneService), resources.AdminAPIKey)
-			err = s.CreateResourceFromStringWithNamespace(updatedProxy, s.Namespace())
+			updatedProxy := fmt.Sprintf(updatedGatewayProxy, s.Deployer.GetAdminEndpoint(resources.DataplaneService), resources.AdminAPIKey)
+			err = s.CreateResourceFromString(updatedProxy)
 			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy")
 
 			By("verify HTTPRoute works for additional gateway group")
@@ -2060,7 +2017,7 @@ spec:
 `
 		It("Should sync ApisixRoute during startup", func() {
 			By("apply ApisixRoute")
-			Expect(s.CreateResourceFromStringWithNamespace(route2, s.Namespace())).ShouldNot(HaveOccurred(), "applying HTTPRoute with non-existent parent")
+			Expect(s.CreateResourceFromString(route2)).ShouldNot(HaveOccurred(), "applying HTTPRoute with non-existent parent")
 			s.ResourceApplied("HTTPRoute", "httpbin", fmt.Sprintf(route, s.Namespace()), 1)
 
 			s.RequestAssert(&scaffold.RequestAssert{
@@ -2080,7 +2037,6 @@ spec:
 				Timeout:  30 * time.Second,
 			})
 
-			time.Sleep(8 * time.Second)
 			By("restart controller and dataplane")
 			s.Deployer.ScaleIngress(0)
 			s.Deployer.ScaleDataplane(0)
@@ -2093,7 +2049,7 @@ spec:
 				Host:     "httpbin",
 				Check:    scaffold.WithExpectedStatus(http.StatusOK),
 				Interval: time.Second * 2,
-				Timeout:  30 * time.Second,
+				Timeout:  1 * time.Minute,
 			})
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method:   "GET",