fix: set default provider type (#2436)

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

Author: ronething

config/samples/config.yaml

@@ -32,7 +32,7 @@ exec_adc_timeout: 15s                   # The timeout for the ADC to execute.
                                         # The default value is 15 seconds.
 
 provider:
-  type: "apisix-standalone"
+  type: "apisix"
 
   sync_period: 0s
                                         # The period between two consecutive syncs.

internal/controller/config/config.go

@@ -51,7 +51,7 @@ func NewDefaultConfig() *Config {
 		LeaderElection:   NewLeaderElection(),
 		ExecADCTimeout:   types.TimeDuration{Duration: 15 * time.Second},
 		ProviderConfig: ProviderConfig{
-			Type:          ProviderTypeStandalone,
+			Type:          ProviderTypeAPISIX,
 			SyncPeriod:    types.TimeDuration{Duration: 0},
 			InitSyncDelay: types.TimeDuration{Duration: 20 * time.Minute},
 		},

test/e2e/framework/apisix_consts.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	ProviderType = cmp.Or(os.Getenv("PROVIDER_TYPE"), "apisix-standalone")
+	ProviderType = cmp.Or(os.Getenv("PROVIDER_TYPE"), "apisix")
 )
 
 var (

test/e2e/framework/manifests/ingress.yaml

@@ -328,7 +328,7 @@ data:
 
     leader_election_id: "apisix-ingress-controller-leader"
     provider:
-      type: {{ .ProviderType | default "apisix-standalone" }}
+      type: {{ .ProviderType | default "apisix" }}
       sync_period: {{ .ProviderSyncPeriod | default "0s" }}
                                         # The period between two consecutive syncs.
                                         # The default value is 0 seconds, which means the controller will not sync.

test/e2e/scaffold/adc.go

@@ -31,7 +31,6 @@ import (
 
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 	"github.com/apache/apisix-ingress-controller/internal/provider/adc/translator"
-	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 )
 
 // DataplaneResource defines the interface for accessing dataplane resources
@@ -136,9 +135,6 @@ func (a *adcDataplaneResource) dumpResources(ctx context.Context) (*translator.T
 		"ADC_SERVER=" + a.serverAddr,
 		"ADC_TOKEN=" + a.token,
 	}
-	if framework.ProviderType != "" {
-		adcEnv = append(adcEnv, "ADC_BACKEND="+framework.ProviderType)
-	}
 
 	var stdout, stderr bytes.Buffer
 	cmd := exec.CommandContext(ctxWithTimeout, "adc", args...)

test/e2e/scaffold/apisix_deployer.go

@@ -384,7 +384,7 @@ func (s *APISIXDeployer) GetAdminEndpoint(svc ...*corev1.Service) string {
 
 func (s *APISIXDeployer) DefaultDataplaneResource() DataplaneResource {
 	return newADCDataplaneResource(
-		"apisix-standalone",
+		framework.ProviderType,
 		fmt.Sprintf("http://%s", s.adminTunnel.Endpoint()),
 		s.AdminKey(),
 		false, // tlsVerify