fix: r

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

Author: ronething

Makefile

@@ -15,6 +15,10 @@ GATEAY_API_VERSION ?= v1.2.0
 DASHBOARD_VERSION ?= dev
 TEST_TIMEOUT ?= 45m
 
+APISIX_IMAGE ?= apache/apisix:dev
+APISIX_ADMIN_KEY ?= edd1c9f034335f136f87ad84b625c8f1
+APISIX_NAMESPACE ?= apisix-standalone
+
 # CRD Reference Documentation
 CRD_REF_DOCS_VERSION ?= v0.1.0
 CRD_REF_DOCS ?= $(LOCALBIN)/crd-ref-docs
@@ -109,7 +113,12 @@ kind-e2e-test: kind-up build-image kind-load-images e2e-test
 .PHONY: e2e-test
 e2e-test:
 	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
-	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -run TestE2E -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
+	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
+
+.PHONY: e2e-test-standalone
+e2e-test-standalone:
+	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
+	APISIX_IMAGE=$(APISIX_IMAGE) APISIX_ADMIN_KEY=$(APISIX_ADMIN_KEY) APISIX_NAMESPACE=$(APISIX_NAMESPACE) go test ./test/e2e/apisix/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
 
 .PHONY: download-api7ee3-chart
 download-api7ee3-chart:

go.mod

@@ -152,7 +152,6 @@ require (
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/onsi/ginkgo v1.10.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect

scripts/run-apisix-e2e.sh

@@ -20,9 +20,9 @@ import (
 )
 
 var _ = Describe("APISIX Standalone Basic Tests", func() {
-	var (
-		s *scaffold.APISIXScaffold
-	)
+	s := scaffold.NewScaffold(&scaffold.Options{
+		ControllerName: "apisix.apache.org/apisix-ingress-controller",
+	})
 
 	Describe("APISIX HTTP Proxy", func() {
 		It("should handle basic HTTP requests", func() {

test/e2e/apisix/basic.go

@@ -10,7 +10,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e
+package apisix
 
 import (
 	"fmt"
@@ -19,7 +19,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/apisix"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )

test/e2e/apisix_e2e_test.go renamed to test/e2e/apisix/e2e_test.go

@@ -21,6 +21,7 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/Masterminds/sprig/v3"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/testing"
 	corev1 "k8s.io/api/core/v1"
@@ -72,10 +73,14 @@ func NewAPISIXDeployer(t testing.TestingT, kubectlOpts *k8s.KubectlOptions, opts
 	}
 }
 
+func (d *APISIXDeployer) GetService() *corev1.Service {
+	return d.service
+}
+
 // Deploy deploys APISIX standalone
 func (d *APISIXDeployer) Deploy(ctx context.Context) error {
 	// Parse and execute template
-	tmpl, err := template.New("apisix-standalone").Parse(apisixStandaloneTemplate)
+	tmpl, err := template.New("apisix-standalone").Funcs(sprig.TxtFuncMap()).Parse(apisixStandaloneTemplate)
 	if err != nil {
 		return fmt.Errorf("failed to parse template: %w", err)
 	}

test/e2e/framework/apisix.go

@@ -13,15 +13,26 @@
 package framework
 
 import (
+	"bufio"
+	"bytes"
 	"context"
+	"fmt"
 	"os"
+	"strings"
+	"sync"
+	"time"
 
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -42,6 +53,7 @@ type APISIXFramework struct {
 	clientset   *kubernetes.Clientset
 	restConfig  *rest.Config
 	K8sClient   client.Client
+	namespace   string
 }
 
 // NewAPISIXFramework creates a new APISIX framework
@@ -60,6 +72,8 @@ func NewAPISIXFramework() *APISIXFramework {
 		namespace = _apisixNamespace
 	}
 
+	f.namespace = namespace
+
 	f.kubectlOpts = k8s.NewKubectlOptions("", "", namespace)
 	restCfg, err := buildRestConfig("")
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "building API Server rest config")
@@ -81,9 +95,17 @@ func NewAPISIXFramework() *APISIXFramework {
 // BeforeSuite initializes the APISIX test environment
 func (f *APISIXFramework) BeforeSuite() {
 	f.Logf("Starting APISIX standalone test suite")
+	_ = k8s.DeleteNamespaceE(GinkgoT(), f.kubectlOpts, f.namespace)
+
+	Eventually(func() error {
+		_, err := k8s.GetNamespaceE(GinkgoT(), f.kubectlOpts, f.namespace)
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return fmt.Errorf("namespace %s still exists", f.namespace)
+	}, "1m", "2s").Should(Succeed())
 
-	// Create namespace for APISIX standalone tests
-	k8s.CreateNamespace(GinkgoT(), f.kubectlOpts, f.kubectlOpts.Namespace)
+	k8s.CreateNamespace(GinkgoT(), f.kubectlOpts, f.namespace)
 
 	f.Logf("APISIX standalone test environment initialized")
 }
@@ -105,3 +127,80 @@ func GetAPISIXFramework() *APISIXFramework {
 func (f *APISIXFramework) Logf(format string, v ...any) {
 	f.Logger.Logf(f.GinkgoT, format, v...)
 }
+
+func (f *APISIXFramework) DeployIngress(opts IngressDeployOpts) {
+	buf := bytes.NewBuffer(nil)
+
+	err := IngressSpecTpl.Execute(buf, opts)
+	f.GomegaT.Expect(err).ToNot(HaveOccurred(), "rendering ingress spec")
+
+	kubectlOpts := k8s.NewKubectlOptions("", "", opts.Namespace)
+
+	k8s.KubectlApplyFromString(f.GinkgoT, kubectlOpts, buf.String())
+
+	err = WaitPodsAvailable(f.GinkgoT, kubectlOpts, metav1.ListOptions{
+		LabelSelector: "control-plane=controller-manager",
+	})
+	f.GomegaT.Expect(err).ToNot(HaveOccurred(), "waiting for controller-manager pod ready")
+	f.WaitControllerManagerLog("All cache synced successfully", 0, time.Minute)
+}
+
+func (f *APISIXFramework) WaitControllerManagerLog(keyword string, sinceSeconds int64, timeout time.Duration) {
+	f.WaitPodsLog("control-plane=controller-manager", keyword, sinceSeconds, timeout)
+}
+
+func (f *APISIXFramework) WaitDPLog(keyword string, sinceSeconds int64, timeout time.Duration) {
+	f.WaitPodsLog("app.kubernetes.io/name=apisix", keyword, sinceSeconds, timeout)
+}
+
+func (f *APISIXFramework) WaitPodsLog(selector, keyword string, sinceSeconds int64, timeout time.Duration) {
+	pods := f.ListRunningPods(selector)
+	wg := sync.WaitGroup{}
+	for _, p := range pods {
+		wg.Add(1)
+		go func(p corev1.Pod) {
+			defer wg.Done()
+			opts := corev1.PodLogOptions{Follow: true}
+			if sinceSeconds > 0 {
+				opts.SinceSeconds = ptr.To(sinceSeconds)
+			} else {
+				opts.TailLines = ptr.To(int64(0))
+			}
+			logStream, err := f.clientset.CoreV1().Pods(p.Namespace).GetLogs(p.Name, &opts).Stream(context.Background())
+			f.GomegaT.Expect(err).Should(gomega.BeNil())
+			scanner := bufio.NewScanner(logStream)
+			scanner.Split(bufio.ScanLines)
+			for scanner.Scan() {
+				line := scanner.Text()
+				if strings.Contains(line, keyword) {
+					return
+				}
+			}
+		}(p)
+	}
+	c := make(chan struct{})
+	go func() {
+		defer close(c)
+		wg.Wait()
+	}()
+	select {
+	case <-c:
+		return
+	case <-time.After(timeout):
+		f.GinkgoT.Error("wait log timeout")
+	}
+}
+
+func (f *APISIXFramework) ListRunningPods(selector string) []corev1.Pod {
+	pods, err := f.clientset.CoreV1().Pods(f.namespace).List(context.TODO(), metav1.ListOptions{
+		LabelSelector: selector,
+	})
+	f.GomegaT.Expect(err).ShouldNot(gomega.HaveOccurred(), "list pod: ", selector)
+	runningPods := make([]corev1.Pod, 0)
+	for _, p := range pods.Items {
+		if p.Status.Phase == corev1.PodRunning && p.DeletionTimestamp == nil {
+			runningPods = append(runningPods, p)
+		}
+	}
+	return runningPods
+}

test/e2e/framework/apisix_framework.go

@@ -43,16 +43,6 @@ var (
 )
 
 func init() {
-	API7EELicense = os.Getenv("API7_EE_LICENSE")
-	if API7EELicense == "" {
-		panic("env {API7_EE_LICENSE} is required")
-	}
-
-	dashboardVersion = os.Getenv("DASHBOARD_VERSION")
-	if dashboardVersion == "" {
-		dashboardVersion = "dev"
-	}
-
 	tmpl, err := template.New("values.yaml").Parse(`
 dashboard:
   image:

test/e2e/framework/dashboard.go

@@ -18,6 +18,7 @@ import (
 	_ "embed"
 	"encoding/base64"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/gruntwork-io/terratest/modules/k8s"
@@ -76,6 +77,16 @@ type Framework struct {
 
 // NewFramework create a global framework with special settings.
 func NewFramework() *Framework {
+	API7EELicense = os.Getenv("API7_EE_LICENSE")
+	if API7EELicense == "" {
+		panic("env {API7_EE_LICENSE} is required")
+	}
+
+	dashboardVersion = os.Getenv("DASHBOARD_VERSION")
+	if dashboardVersion == "" {
+		dashboardVersion = "dev"
+	}
+
 	f := &Framework{
 		GinkgoT:           GinkgoT(),
 		GomegaT:           NewWithT(GinkgoT(4)),

test/e2e/framework/framework.go

@@ -1,9 +1,4 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Namespace }}
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   name: apisix-conf
@@ -20,7 +15,7 @@ data:
         enabled: true
     nginx_config:
       worker_processes: 2
-      error_log_level: debug
+      error_log_level: info
     deployment:
       role: data_plane
       role_data_plane:
@@ -54,13 +49,6 @@ spec:
       containers:
         - name: apisix
           image: {{ .Image }}
-          resources:
-            requests:
-              cpu: 1000m
-              memory: 500Mi
-            limits:
-              cpu: 2000m
-              memory: 1500Mi
           ports:
             - name: http
               containerPort: 9080
@@ -91,16 +79,19 @@ metadata:
   labels:
     app: apisix
 spec:
-  type: {{ .ServiceType }}
+  type: {{ .ServiceType | default "NodePort" }}
   ports:
-    - port: 80
+    - port: 9080
       name: http
+      protocol: TCP
       targetPort: 9080
-    - port: 443
+    - port: 9443
       name: https
+      protocol: TCP
       targetPort: 9443
     - port: 9180
       name: admin
+      protocol: TCP
       targetPort: 9180
   selector:
     app: apisix