Merge branch 'feat/apisix-mod' into feat/support-admin-api-mode

Author: dspo

test/conformance/apisix/suite_test.go

@@ -12,7 +12,6 @@
 package conformance
 
 import (
-	"cmp"
 	"context"
 	"fmt"
 	"os"
@@ -161,7 +160,7 @@ func TestMain(m *testing.M) {
 		Namespace:          namespace,
 		StatusAddress:      address,
 		InitSyncDelay:      1 * time.Minute,
-		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
+		ProviderType:       framework.ProviderType,
 		ProviderSyncPeriod: 10 * time.Millisecond,
 	})
 

test/e2e/framework/apisix_consts.go

@@ -13,6 +13,7 @@
 package framework
 
 import (
+	"cmp"
 	_ "embed"
 	"os"
 	"text/template"
@@ -21,11 +22,11 @@ import (
 )
 
 var (
-	ProviderType = os.Getenv("PROVIDER_TYPE")
+	ProviderType = cmp.Or(os.Getenv("PROVIDER_TYPE"), "apisix-standalone")
 )
 
 var (
-	//go:embed manifests/apisix-standalone.yaml
+	//go:embed manifests/apisix.yaml
 	apisixStandaloneTemplate string
 	APISIXStandaloneTpl      *template.Template
 

test/e2e/framework/manifests/apisix-standalone.yaml renamed to test/e2e/framework/manifests/apisix.yaml

@@ -14,7 +14,6 @@ package scaffold
 
 import (
 	"bytes"
-	"cmp"
 	"fmt"
 	"os"
 	"time"
@@ -180,7 +179,7 @@ func (s *APISIXDeployer) newAPISIXTunnels(serviceName string) error {
 
 func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Service {
 	if opts.ServiceName == "" {
-		opts.ServiceName = "apisix-standalone"
+		opts.ServiceName = framework.ProviderType
 	}
 
 	if opts.ServiceHTTPPort == 0 {
@@ -195,7 +194,6 @@ func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Serv
 	kubectlOpts := k8s.NewKubectlOptions("", "", opts.Namespace)
 
 	if framework.ProviderType == adc.BackendModeAPISIX {
-		opts.ServiceName = "apisix"
 		opts.ConfigProvider = "etcd"
 		// deploy etcd
 		k8s.KubectlApplyFromString(s.GinkgoT, kubectlOpts, framework.EtcdSpec)
@@ -236,7 +234,7 @@ func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Serv
 func (s *APISIXDeployer) DeployIngress() {
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
-		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
+		ProviderType:       framework.ProviderType,
 		ProviderSyncPeriod: 200 * time.Millisecond,
 		Namespace:          s.namespace,
 		Replicas:           1,
@@ -246,7 +244,7 @@ func (s *APISIXDeployer) DeployIngress() {
 func (s *APISIXDeployer) ScaleIngress(replicas int) {
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
-		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
+		ProviderType:       framework.ProviderType,
 		ProviderSyncPeriod: 200 * time.Millisecond,
 		Namespace:          s.namespace,
 		Replicas:           replicas,