fix: separate scaffold

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

Author: ronething

cmd/root/root.go

@@ -20,7 +20,7 @@ import (
 	// to ensure that exec-entrypoint and run can make use of them.
 
 	"go.uber.org/zap/zapcore"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"github.com/go-logr/zapr"

go.mod

@@ -27,7 +27,7 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/net v0.28.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.15.4
 	k8s.io/api v0.31.1
 	k8s.io/apiextensions-apiserver v0.31.1
@@ -208,7 +208,7 @@ require (
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiserver v0.31.1 // indirect
 	k8s.io/cli-runtime v0.30.3 // indirect
 	k8s.io/component-base v0.31.1 // indirect

internal/controller/config/config.go

@@ -21,7 +21,7 @@ import (
 	"text/template"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/apache/apisix-ingress-controller/internal/types"
 )

test/e2e/adminapi/dashboard_api.go

@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
+	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
 // TestAPISIXE2E runs e2e tests using the APISIX standalone mode
@@ -28,7 +29,10 @@ func TestAPISIXE2E(t *testing.T) {
 	// init framework
 	_ = framework.NewFramework()
 
-	// TODO: init newDeployer function
+	// init newDeployer function
+	scaffold.NewDeployer = func(s *scaffold.Scaffold) scaffold.Deployer {
+		return scaffold.NewAPISIXDeployer(s)
+	}
 
 	_, _ = fmt.Fprintf(GinkgoWriter, "Starting APISIX standalone e2e suite\n")
 	RunSpecs(t, "apisix standalone e2e suite")

test/e2e/apisix/e2e_test.go

@@ -19,18 +19,23 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/adminapi"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/ingress"
+	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
 // Run e2e tests using the Ginkgo runner.
 func TestE2E(t *testing.T) {
 	RegisterFailHandler(Fail)
 	f := framework.NewFramework()
 
+	// init newDeployer function
+	scaffold.NewDeployer = func(s *scaffold.Scaffold) scaffold.Deployer {
+		return scaffold.NewAPI7Deployer(s)
+	}
+
 	BeforeSuite(f.BeforeSuite)
 	AfterSuite(f.AfterSuite)
 

test/e2e/e2e_test.go

@@ -16,13 +16,14 @@ import (
 	_ "embed"
 	"encoding/json"
 	"fmt"
-	"github.com/gavv/httpexpect/v2"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"text/template"
 
+	"github.com/gavv/httpexpect/v2"
+
 	"github.com/google/uuid"
 	. "github.com/onsi/gomega"
 

test/e2e/framework/api7_dashboard.go

@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/ginkgo/v2" //nolint:staticcheck
 	. "github.com/onsi/gomega"    //nolint:staticcheck
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/cli"
@@ -132,10 +132,15 @@ func (f *Framework) deploy() {
 		"Tag": dashboardVersion,
 	})
 
+	f.Logf("values: %s", buf.String())
+
 	var v map[string]any
 	err = yaml.Unmarshal(buf.Bytes(), &v)
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "unmarshal values")
 	_, err = install.Run(chart, v)
+	if err != nil {
+		f.Logf("install dashboard failed, err: %v", err)
+	}
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "install dashboard")
 
 	err = f.ensureService("api7ee3-dashboard", _namespace, 1)

test/e2e/framework/api7_framework.go

@@ -587,13 +587,13 @@ spec:
 				Expect().
 				Status(200)
 
-			s.ScaleIngress(0)
+			s.Deployer.ScaleIngress(0)
 
 			By("delete HTTPRoute httpbin2")
 			err := s.DeleteResource("HTTPRoute", "httpbin2")
 			Expect(err).NotTo(HaveOccurred(), "deleting HTTPRoute httpbin2")
 
-			s.ScaleIngress(1)
+			s.Deployer.ScaleIngress(1)
 			time.Sleep(1 * time.Minute)
 
 			s.NewAPISIXClient().

test/e2e/gatewayapi/httproute.go

@@ -285,13 +285,13 @@ spec:
 				Expect().
 				Status(200)
 
-			s.ScaleIngress(0)
+			s.Deployer.ScaleIngress(0)
 
 			By("delete Ingress")
 			err = s.DeleteResourceFromString(defaultIngress)
 			Expect(err).NotTo(HaveOccurred(), "deleting Ingress without IngressClass")
 
-			s.ScaleIngress(1)
+			s.Deployer.ScaleIngress(1)
 			time.Sleep(1 * time.Minute)
 
 			s.NewAPISIXClient().