fix test

Author: AlinsRan

internal/provider/api7ee/provider.go

@@ -262,20 +262,13 @@ func (d *api7eeProvider) Start(ctx context.Context) error {
 	retrier := common.NewRetrier(common.NewExponentialBackoff(RetryBaseDelay, RetryMaxDelay))
 
 	for {
-		synced := false
 		select {
 		case <-d.syncCh:
-			synced = true
+		case <-retrier.C():
 		case <-ticker.C:
-			synced = true
 		case <-ctx.Done():
 			return nil
 		}
-		if synced {
-			if err := d.sync(ctx); err != nil {
-				d.log.Error(err, "failed to sync for startup")
-			}
-		}
 
 		if err := d.sync(ctx); err != nil {
 			d.log.Error(err, "failed to sync")

test/e2e/api7/route.go

@@ -23,34 +23,41 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/yaml"
 
-	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
 var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org", "v2", "apisixroute"), func() {
-	var (
-		s = scaffold.NewScaffold(scaffold.Options{
-			// for triggering the sync
-			SyncPeriod: 3 * time.Second,
-		})
-	)
+	s := scaffold.NewDefaultScaffold()
 
 	Context("Test ApisixRoute Sync Status", func() {
-		BeforeEach(func() {
-			By("create GatewayProxy")
-			err := s.CreateResourceFromString(s.GetGatewayProxySpec())
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
-			time.Sleep(5 * time.Second)
-
-			By("create IngressClass")
-			err = s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
-			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
-			time.Sleep(5 * time.Second)
-		})
-		const ar = `
+		const (
+			serviceSpec = `
+apiVersion: v1
+kind: Service
+metadata:
+  name: api7ee3-dashboard
+spec:
+  type: ExternalName
+  externalName: %s
+`
+			gatewayProxyYaml = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: apisix-proxy-config
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+        - https://api7ee3-dashboard:7443
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+			ar = `
 apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
@@ -69,55 +76,43 @@ spec:
     - serviceName: httpbin-service-e2e-test
       servicePort: 80
 `
+		)
 
-		FIt("dataplane unavailable", func() {
+		It("dataplane unavailable", func() {
 			s.Deployer.ScaleIngress(0)
+			By("create GatewayProxy")
+			err := s.CreateResourceFromString(fmt.Sprintf(gatewayProxyYaml, s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+
+			By("create IngressClass")
+			err = s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
+			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
+
+			By("create Service with invalid host")
+			err = s.CreateResourceFromString(fmt.Sprintf(serviceSpec, "invalid.host"))
+			Expect(err).NotTo(HaveOccurred(), "creating Service")
+
 			By("apply ApisixRoute")
-			err := s.CreateResourceFromString(fmt.Sprintf(ar, s.Namespace(), s.Namespace()))
+			err = s.CreateResourceFromString(fmt.Sprintf(ar, s.Namespace(), s.Namespace()))
 			Expect(err).NotTo(HaveOccurred(), "creating ApisixRoute")
 
-			By("update service to invalid host")
-			k8sservice, err := s.GetService(framework.Namespace, framework.DashboardServiceName)
-			Expect(err).NotTo(HaveOccurred(), "getting service")
-			oldSpec := k8sservice.Spec
-			k8sservice.Spec = corev1.ServiceSpec{
-				Type:         corev1.ServiceTypeExternalName,
-				ExternalName: "invalid.host",
-			}
-			newServiceYaml, err := yaml.Marshal(k8sservice)
-			Expect(err).NotTo(HaveOccurred(), "marshalling service")
-			err = s.CreateResourceFromString(string(newServiceYaml))
-			Expect(err).NotTo(HaveOccurred(), "creating service")
-
 			s.Deployer.ScaleIngress(1)
 
-			By("check route in APISIX")
-			s.RequestAssert(&scaffold.RequestAssert{
-				Method:  "GET",
-				Path:    "/get",
-				Headers: map[string]string{"Host": "httpbin"},
-				Check:   scaffold.WithExpectedStatus(404),
-			})
-
 			By("check ApisixRoute status")
 			s.RetryAssertion(func() string {
 				output, _ := s.GetOutputFromString("ar", "default", "-o", "yaml", "-n", s.Namespace())
 				return output
-			}).WithTimeout(60 * time.Second).
+			}).WithTimeout(5 * time.Minute).
 				Should(
 					And(
 						ContainSubstring(`status: "False"`),
 						ContainSubstring(`reason: SyncFailed`),
 					),
 				)
 
-			By("update service to original spec")
-			k8sservice, err = s.GetService(framework.Namespace, framework.DashboardServiceName)
-			k8sservice.Spec = oldSpec
-			newServiceYaml, err = yaml.Marshal(k8sservice)
-			Expect(err).NotTo(HaveOccurred(), "marshalling service")
-			err = s.CreateResourceFromString(string(newServiceYaml))
-			Expect(err).NotTo(HaveOccurred(), "creating service")
+			By("update service to dashboard")
+			err = s.CreateResourceFromString(fmt.Sprintf(serviceSpec, "api7ee3-dashboard.api7-ee-e2e.svc.cluster.local"))
+			Expect(err).NotTo(HaveOccurred(), "updating Service")
 
 			By("check ApisixRoute status after scaling up")
 			s.RetryAssertion(func() string {

test/e2e/framework/api7_consts.go

@@ -36,12 +36,6 @@ const (
 	DashboardEndpoint    = "http://api7ee3-dashboard.api7-ee-e2e:7080"
 	DashboardTLSEndpoint = "https://api7ee3-dashboard.api7-ee-e2e:7443"
 	DPManagerTLSEndpoint = "https://api7ee3-dp-manager.api7-ee-e2e:7943"
-
-	DashboardServiceName = "api7ee3-dashboard"
-)
-
-const (
-	ProviderTypeAPI7EE = "api7ee"
 )
 
 const (

test/e2e/scaffold/api7_deployer.go

@@ -193,20 +193,22 @@ func (s *API7Deployer) DeployIngress() {
 	}
 
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
-		ProviderType:   "api7ee",
-		ControllerName: s.runtimeOpts.ControllerName,
-		Namespace:      s.namespace,
-		Replicas:       ptr.To(1),
-		WebhookEnable:  s.runtimeOpts.EnableWebhook,
+		ProviderType:       "api7ee",
+		ControllerName:     s.runtimeOpts.ControllerName,
+		ProviderSyncPeriod: 1 * time.Hour,
+		Namespace:          s.namespace,
+		Replicas:           ptr.To(1),
+		WebhookEnable:      s.runtimeOpts.EnableWebhook,
 	})
 }
 
 func (s *API7Deployer) ScaleIngress(replicas int) {
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
-		ProviderType:   "api7ee",
-		ControllerName: s.runtimeOpts.ControllerName,
-		Namespace:      s.namespace,
-		Replicas:       ptr.To(replicas),
+		ProviderType:       "api7ee",
+		ControllerName:     s.runtimeOpts.ControllerName,
+		ProviderSyncPeriod: 1 * time.Hour,
+		Namespace:          s.namespace,
+		Replicas:           ptr.To(replicas),
 	})
 }
 

test/e2e/scaffold/k8s.go

@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"reflect"
 	"strings"
 	"time"
 
@@ -103,17 +102,6 @@ func (s *Scaffold) GetOutputFromString(shell ...string) (string, error) {
 	return output, err
 }
 
-func (s *Scaffold) GetOutputFromStringWithNamespace(ns string, shell ...string) (string, error) {
-	cmdArgs := []string{}
-	cmdArgs = append(cmdArgs, "get")
-	cmdArgs = append(cmdArgs, shell...)
-	var newOpts k8s.KubectlOptions
-	reflect.Copy(reflect.ValueOf(newOpts), reflect.ValueOf(*s.kubectlOptions))
-	newOpts.Namespace = ns
-	output, err := k8s.RunKubectlAndGetOutputE(GinkgoT(), &newOpts, cmdArgs...)
-	return output, err
-}
-
 func (s *Scaffold) GetResourceYamlFromNamespace(resourceType, resourceName, namespace string) (string, error) {
 	return s.GetOutputFromString(resourceType, resourceName, "-n", namespace, "-o", "yaml")
 }
@@ -133,11 +121,6 @@ func (s *Scaffold) GetServiceByName(name string) (*corev1.Service, error) {
 	return k8s.GetServiceE(s.t, s.kubectlOptions, name)
 }
 
-func (s *Scaffold) GetService(namespace, name string) (*corev1.Service, error) {
-	kubectlOptions := k8s.NewKubectlOptions("", "", namespace)
-	return k8s.GetServiceE(s.t, kubectlOptions, name)
-}
-
 // ListPodsByLabels lists all pods which matching the label selector.
 func (s *Scaffold) ListPodsByLabels(labels string) ([]corev1.Pod, error) {
 	return k8s.ListPodsE(s.t, s.kubectlOptions, metav1.ListOptions{