perf

Author: AlinsRan

config/samples/config.yaml

@@ -1,4 +1,4 @@
-log_level: "debug"                               # The log level of the APISIX Ingress Controller.
+log_level: "info"                               # The log level of the APISIX Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: apisix.apache.org/apisix-ingress-controller  # The controller name of the APISIX Ingress Controller,

internal/manager/run.go

@@ -151,14 +151,12 @@ func Run(ctx context.Context, logger logr.Logger) error {
 		return err
 	}
 
-	provider, err := adc.New(
-		updater.Writer(),
-		&adc.Options{
-			SyncTimeout:   config.ControllerConfig.ExecADCTimeout.Duration,
-			SyncPeriod:    config.ControllerConfig.ProviderConfig.SyncPeriod.Duration,
-			InitSyncDelay: config.ControllerConfig.ProviderConfig.InitSyncDelay.Duration,
-			BackendMode:   string(config.ControllerConfig.ProviderConfig.Type),
-		})
+	provider, err := adc.New(&adc.Options{
+		SyncTimeout:   config.ControllerConfig.ExecADCTimeout.Duration,
+		SyncPeriod:    config.ControllerConfig.ProviderConfig.SyncPeriod.Duration,
+		InitSyncDelay: config.ControllerConfig.ProviderConfig.InitSyncDelay.Duration,
+		BackendMode:   string(config.ControllerConfig.ProviderConfig.Type),
+	})
 	if err != nil {
 		setupLog.Error(err, "unable to create provider")
 		return err

internal/provider/adc/adc.go

@@ -29,7 +29,6 @@ import (
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
 	"github.com/apache/apisix-ingress-controller/internal/controller/label"
-	"github.com/apache/apisix-ingress-controller/internal/controller/status"
 	"github.com/apache/apisix-ingress-controller/internal/provider"
 	"github.com/apache/apisix-ingress-controller/internal/provider/adc/translator"
 	types "github.com/apache/apisix-ingress-controller/internal/types"
@@ -74,7 +73,7 @@ type Task struct {
 	configs       []adcConfig
 }
 
-func New(updater status.Updater, opts ...Option) (provider.Provider, error) {
+func New(opts ...Option) (provider.Provider, error) {
 	o := Options{}
 	o.ApplyOptions(opts)
 

internal/provider/adc/status.go

@@ -87,7 +87,7 @@ spec:
 				),
 				fmt.Sprintf("checking %s condition status", resourType),
 			)
-		time.Sleep(1 * time.Second)
+		time.Sleep(3 * time.Second)
 	}
 	var beforeEach = func(s *scaffold.Scaffold, gatewayName string) {
 		err := s.CreateResourceFromString(fmt.Sprintf(`
@@ -128,7 +128,7 @@ metadata:
 		Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the apisix-ingress-controller"), "checking Gateway condition message")
 	}
 
-	PContext("Create resource with first controller", func() {
+	Context("Create resource with first controller", func() {
 		s1 := scaffold.NewScaffold(&scaffold.Options{
 			Name:           "gateway1",
 			ControllerName: "apisix.apache.org/apisix-ingress-controller-1",
@@ -174,7 +174,7 @@ spec:
 			assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], "apisix.apache.org/apisix-ingress-controller-1")
 		})
 	})
-	PContext("Create resource with second controller", func() {
+	Context("Create resource with second controller", func() {
 		s2 := scaffold.NewScaffold(&scaffold.Options{
 			Name:           "gateway2",
 			ControllerName: "apisix.apache.org/apisix-ingress-controller-2",

internal/types/map.go

@@ -985,7 +985,6 @@ spec:
 			By("update secret")
 			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(secretSpec, base64.StdEncoding.EncodeToString([]byte(resources.AdminAPIKey))), s.Namespace())
 			Expect(err).NotTo(HaveOccurred(), "creating secret")
-			time.Sleep(15 * time.Minute)
 
 			By("verify Ingress works for additional gateway group")
 			Eventually(func() int {