fix: gateway proxy

Signed-off-by: ashing <[email protected]>

Author: ronething

test/e2e/gatewayapi/controller.go

@@ -8,10 +8,29 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/api7/api7-ingress-controller/test/e2e/framework"
 	"github.com/api7/api7-ingress-controller/test/e2e/scaffold"
 )
 
 var _ = Describe("Check if controller cache gets synced with correct resources", func() {
+
+	var gatewayProxyYaml = `
+apiVersion: gateway.apisix.io/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: api7-proxy-config
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+
 	var defautlGatewayClass = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
@@ -34,6 +53,11 @@ spec:
     - name: http1
       protocol: HTTP
       port: 80
+  infrastructure:
+    parametersRef:
+      group: gateway.apisix.io
+      kind: GatewayProxy
+      name: api7-proxy-config
 `
 
 	var ResourceApplied = func(s *scaffold.Scaffold, resourType, resourceName, ns, resourceRaw string, observedGeneration int) {
@@ -63,6 +87,13 @@ metadata:
 `, gatewayName))
 		Expect(err).NotTo(HaveOccurred(), "creating namespace")
 		By(fmt.Sprintf("create GatewayClass for controller %s", s.GetControllerName()))
+
+		By("create GatewayProxy")
+		gatewayProxy := fmt.Sprintf(gatewayProxyYaml, framework.DashboardTLSEndpoint, s.AdminKey())
+		err = s.CreateResourceFromStringWithNamespace(gatewayProxy, gatewayName)
+		Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+		time.Sleep(5 * time.Second)
+
 		gatewayClassName := fmt.Sprintf("api7-%d", time.Now().Unix())
 		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, gatewayName, s.GetControllerName()), gatewayName)
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")

test/e2e/gatewayapi/gatewayproxy.go

@@ -42,19 +42,6 @@ spec:
       name: api7-proxy-config
 `
 
-	var gatewayWithoutProxy = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: api7
-spec:
-  gatewayClassName: %s
-  listeners:
-    - name: http
-      protocol: HTTP
-      port: 80
-`
-
 	var gatewayProxyWithEnabledPlugin = `
 apiVersion: gateway.apisix.io/v1alpha1
 kind: GatewayProxy
@@ -84,6 +71,15 @@ kind: GatewayProxy
 metadata:
   name: api7-proxy-config
 spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+        - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
   plugins:
   - name: response-rewrite
     enabled: false
@@ -98,6 +94,15 @@ kind: GatewayProxy
 metadata:
   name: api7-proxy-config
 spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+        - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
   plugins:
   - name: error-page
     enabled: true
@@ -117,6 +122,15 @@ kind: GatewayProxy
 metadata:
   name: api7-proxy-config
 spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+        - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
   plugins:
   - name: error-page
     enabled: true
@@ -226,7 +240,7 @@ spec:
 			resp.Header("X-Proxy-Test").IsEqual("enabled")
 
 			By("Update GatewayProxy with disabled plugin")
-			err := s.CreateResourceFromString(gatewayProxyWithDisabledPlugin)
+			err := s.CreateResourceFromString(fmt.Sprintf(gatewayProxyWithDisabledPlugin, framework.DashboardTLSEndpoint, s.AdminKey()))
 			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy with disabled plugin")
 			time.Sleep(5 * time.Second)
 
@@ -242,37 +256,6 @@ spec:
 
 			resp.Header("X-Proxy-Test").IsEmpty()
 		})
-
-		It("Should work normally without GatewayProxy", func() {
-			By("Create HTTPRoute for Gateway with GatewayProxy")
-			resourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
-
-			By("Check if the plugin is applied")
-			resp := s.NewAPISIXClient().
-				GET("/get").
-				WithHost("example.com").
-				Expect().
-				Status(200)
-
-			resp.Header("X-Proxy-Test").IsEqual("enabled")
-
-			By("Update Gateway without GatewayProxy")
-			err := s.CreateResourceFromString(fmt.Sprintf(gatewayWithoutProxy, gatewayClassName))
-			Expect(err).NotTo(HaveOccurred(), "updating Gateway without GatewayProxy")
-			time.Sleep(5 * time.Second)
-
-			By("Create HTTPRoute for Gateway without GatewayProxy")
-			resourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
-
-			By("Check if the route works without plugin")
-			resp = s.NewAPISIXClient().
-				GET("/get").
-				WithHost("example.com").
-				Expect().
-				Status(200)
-
-			resp.Header("X-Proxy-Test").IsEmpty()
-		})
 	})
 
 	Context("Test Gateway with PluginMetadata", func() {
@@ -282,7 +265,7 @@ spec:
 
 		It("Should work OK with error-page", func() {
 			By("Update GatewayProxy with PluginMetadata")
-			err = s.CreateResourceFromString(gatewayProxyWithPluginMetadata0)
+			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyWithPluginMetadata0, framework.DashboardTLSEndpoint, s.AdminKey()))
 			Expect(err).ShouldNot(HaveOccurred())
 			time.Sleep(5 * time.Second)
 
@@ -298,7 +281,7 @@ spec:
 				Body().Contains("404 from plugin metadata")
 
 			By("Update GatewayProxy with PluginMetadata")
-			err = s.CreateResourceFromString(gatewayProxyWithPluginMetadata1)
+			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyWithPluginMetadata1, framework.DashboardTLSEndpoint, s.AdminKey()))
 			Expect(err).ShouldNot(HaveOccurred())
 			time.Sleep(5 * time.Second)
 
@@ -311,7 +294,7 @@ spec:
 				Body().Contains(`{"error_msg":"404 Route Not Found"}`)
 
 			By("Delete GatewayProxy")
-			err = s.DeleteResourceFromString(gatewayProxyWithPluginMetadata0)
+			err = s.DeleteResourceFromString(fmt.Sprintf(gatewayProxyWithPluginMetadata0, framework.DashboardTLSEndpoint, s.AdminKey()))
 			Expect(err).ShouldNot(HaveOccurred())
 			time.Sleep(5 * time.Second)