fix: r

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

Author: ronething

config/samples/config.yaml

@@ -1,23 +1,20 @@
-log_level: "debug"                               # The log level of the API7 Ingress Controller.
+log_level: "info"                               # The log level of the API7 Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: gateway.api7.io/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
                                                           # which is used to identify the controller in the GatewayClass.
                                                           # The default value is "gateway.api7.io/api7-ingress-controller".
-
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
-
 ingress_class: api7 # The ingress class name of the API7 Ingress Controller.
 ingress_publish_service: "" # The service name of the ingress publish service.
 ingress_status_address: [] # The status address of the ingress.
-
 gateway_configs:                  # The configuration of the API7 Gateway.
 - name: api7                      # The name of the Gateway in the Gateway API.
   control_plane:
-    admin_key: "a7adm-2BU3prqKv68BU8DNTaZJIOnIhkH0RJ1xCY3tXGOiEneBfqVF5F-0a0f8eb4d7d94fc6aed43566a6f2989a"     # The admin key of the control plane.
+    admin_key: "${ADMIN_KEY}"     # The admin key of the control plane.
     endpoints:         
-      - "https://172.18.0.5:7443"               # The endpoint of the control plane.                    
+      - ${ENDPOINT}               # The endpoint of the control plane.                    
     tls_verify: false
   addresses:                      # record the status address of the gateway-api gateway
-  - "172.18.0.5"                  # The LB IP of the gateway service.
+  - "172.18.0.4"                  # The LB IP of the gateway service.

test/e2e/e2e_test.go

@@ -26,7 +26,7 @@ import (
 	_ "github.com/api7/api7-ingress-controller/test/e2e/adminapi"
 	"github.com/api7/api7-ingress-controller/test/e2e/framework"
 	_ "github.com/api7/api7-ingress-controller/test/e2e/gatewayapi"
-	// _ "github.com/api7/api7-ingress-controller/test/e2e/ingress"
+	_ "github.com/api7/api7-ingress-controller/test/e2e/ingress"
 )
 
 // Run e2e tests using the Ginkgo runner.

test/e2e/gatewayapi/gateway.go

@@ -3,6 +3,7 @@ package gatewayapi
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -15,9 +16,9 @@ import (
 
 const _secretName = "test-apisix-tls"
 
-var Cert = framework.TestServerCert
+var Cert = strings.TrimSpace(framework.TestServerCert)
 
-var Key = framework.TestServerKey
+var Key = strings.TrimSpace(framework.TestServerKey)
 
 func createSecret(s *scaffold.Scaffold, secretName string) {
 	err := s.NewKubeTlsSecret(secretName, Cert, Key)

test/e2e/ingress/ingress.go

@@ -3,6 +3,7 @@ package ingress
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -15,9 +16,9 @@ import (
 
 const _secretName = "test-ingress-tls"
 
-var Cert = framework.TestServerCert
+var Cert = strings.TrimSpace(framework.TestServerCert)
 
-var Key = framework.TestServerKey
+var Key = strings.TrimSpace(framework.TestServerKey)
 
 func createSecret(s *scaffold.Scaffold, secretName string) {
 	err := s.NewKubeTlsSecret(secretName, Cert, Key)
@@ -54,7 +55,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: example-service
+            name: httpbin-service-e2e-test
             port:
               number: 80
 `
@@ -74,13 +75,20 @@ spec:
 			ingressYaml, err := s.GetResourceYaml("Ingress", "api7-ingress")
 			Expect(err).NotTo(HaveOccurred(), "getting Ingress yaml")
 			Expect(ingressYaml).To(ContainSubstring("example.com"), "checking Ingress host")
+
+			By("verify HTTP request")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("example.com").
+				Expect().
+				Status(200)
 		})
 	})
 
 	Context("Ingress TLS", func() {
 		It("Check if SSL resource was created", func() {
 			secretName := _secretName
-			host := "secure.example.com"
+			host := "api6.com"
 			createSecret(s, secretName)
 
 			var defaultIngressClass = `
@@ -111,7 +119,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: secure-service
+            name: httpbin-service-e2e-test
             port:
               number: 80
 `, host, secretName, host)
@@ -129,87 +137,9 @@ spec:
 			By("check TLS configuration")
 			tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
 			assert.Nil(GinkgoT(), err, "list tls error")
-			assert.NotEmpty(GinkgoT(), tls, "tls list should not be empty")
-
-			// At least one TLS certificate should contain our host
-			foundHost := false
-			for _, sslObj := range tls {
-				for _, sni := range sslObj.Snis {
-					if sni == host {
-						foundHost = true
-						break
-					}
-				}
-				if foundHost {
-					break
-				}
-			}
-			assert.True(GinkgoT(), foundHost, "host not found in any SSL configuration")
-		})
-	})
-
-	Context("Multiple Paths and Backends", func() {
-		var defaultIngressClass = `
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  name: api7
-spec:
-  controller: "gateway.api7.io/api7-ingress-controller"
-`
-
-		var multiPathIngress = `
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: api7-ingress-multi
-spec:
-  ingressClassName: api7
-  rules:
-  - host: multi.example.com
-    http:
-      paths:
-      - path: /api
-        pathType: Prefix
-        backend:
-          service:
-            name: api-service
-            port:
-              number: 80
-      - path: /web
-        pathType: Prefix
-        backend:
-          service:
-            name: web-service
-            port:
-              number: 80
-      - path: /admin
-        pathType: Prefix
-        backend:
-          service:
-            name: admin-service
-            port:
-              number: 80
-`
-
-		It("Create Multi-path Ingress", func() {
-			By("create IngressClass")
-			err := s.CreateResourceFromStringWithNamespace(defaultIngressClass, "")
-			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
-			time.Sleep(5 * time.Second)
-
-			By("create Multi-path Ingress")
-			err = s.CreateResourceFromString(multiPathIngress)
-			Expect(err).NotTo(HaveOccurred(), "creating Multi-path Ingress")
-			time.Sleep(5 * time.Second)
-
-			By("check Ingress status")
-			ingressYaml, err := s.GetResourceYaml("Ingress", "api7-ingress-multi")
-			Expect(err).NotTo(HaveOccurred(), "getting Ingress yaml")
-			Expect(ingressYaml).To(ContainSubstring("multi.example.com"), "checking Ingress host")
-			Expect(ingressYaml).To(ContainSubstring("/api"), "checking path /api")
-			Expect(ingressYaml).To(ContainSubstring("/web"), "checking path /web")
-			Expect(ingressYaml).To(ContainSubstring("/admin"), "checking path /admin")
+			assert.Len(GinkgoT(), tls, 1, "tls number not expect")
+			assert.Equal(GinkgoT(), Cert, tls[0].Cert, "tls cert not expect")
+			assert.ElementsMatch(GinkgoT(), []string{host}, tls[0].Snis)
 		})
 	})
 
@@ -225,15 +155,6 @@ spec:
   controller: "gateway.api7.io/api7-ingress-controller"
 `
 
-		var secondaryIngressClass = `
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  name: api7-secondary
-spec:
-  controller: "gateway.api7.io/api7-ingress-controller"
-`
-
 		var defaultIngress = `
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -248,27 +169,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: default-service
-            port:
-              number: 80
-`
-
-		var specificIngress = `
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: api7-ingress-specific
-spec:
-  ingressClassName: api7-secondary
-  rules:
-  - host: specific.example.com
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: specific-service
+            name: httpbin-service-e2e-test
             port:
               number: 80
 `
@@ -279,11 +180,6 @@ spec:
 			Expect(err).NotTo(HaveOccurred(), "creating Default IngressClass")
 			time.Sleep(5 * time.Second)
 
-			By("create Secondary IngressClass")
-			err = s.CreateResourceFromStringWithNamespace(secondaryIngressClass, "")
-			Expect(err).NotTo(HaveOccurred(), "creating Secondary IngressClass")
-			time.Sleep(5 * time.Second)
-
 			By("create Ingress without IngressClass")
 			err = s.CreateResourceFromString(defaultIngress)
 			Expect(err).NotTo(HaveOccurred(), "creating Ingress without IngressClass")
@@ -294,16 +190,12 @@ spec:
 			Expect(err).NotTo(HaveOccurred(), "getting Default Ingress yaml")
 			Expect(ingressYaml).To(ContainSubstring("default.example.com"), "checking Default Ingress host")
 
-			By("create Ingress with specific IngressClass")
-			err = s.CreateResourceFromString(specificIngress)
-			Expect(err).NotTo(HaveOccurred(), "creating Ingress with specific IngressClass")
-			time.Sleep(5 * time.Second)
-
-			By("check Specific Ingress")
-			ingressYaml, err = s.GetResourceYaml("Ingress", "api7-ingress-specific")
-			Expect(err).NotTo(HaveOccurred(), "getting Specific Ingress yaml")
-			Expect(ingressYaml).To(ContainSubstring("specific.example.com"), "checking Specific Ingress host")
-			Expect(ingressYaml).To(ContainSubstring("api7-secondary"), "checking Specific Ingress class")
+			By("verify default ingress")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("default.example.com").
+				Expect().
+				Status(200)
 		})
 	})
 })