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

# Conflicts:
#	.github/workflows/apisix-e2e-test.yml
#	internal/provider/adc/adc.go

Author: dspo

internal/provider/adc/adc.go

@@ -186,9 +186,6 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 		}
 	}
 
-	// This mode is full synchronization,
-	// which only needs to be saved in cache
-	// and triggered by a timer for synchronization
 	switch d.BackendMode {
 	case BackendModeAPI7EE:
 		if apiv2.Is(obj) {
@@ -197,6 +194,9 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 	case BackendModeAPISIX:
 		// do nothing
 	case BackendModeAPISIXStandalone:
+		// This mode is full synchronization,
+		// which only needs to be saved in cache
+		// and triggered by a timer for synchronization
 		return nil
 	default:
 		return errors.Errorf("unknown backend mode: %s", d.BackendMode)
@@ -271,7 +271,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 			})
 		}
 		return nil
-	case BackendModeAPI7EE:
+	case BackendModeAPI7EE, BackendModeAPISIX:
 		return d.sync(ctx, Task{
 			Name:          obj.GetName(),
 			Labels:        labels,

test/e2e/gatewayapi/httproute.go

@@ -524,7 +524,7 @@ spec:
 			By("create HTTPRoute")
 			ResourceApplied("HTTPRoute", "httpbin", exactRouteByGet, 1)
 
-			By("access daataplane to check the HTTPRoute")
+			By("access dataplane to check the HTTPRoute")
 			s.NewAPISIXClient().
 				GET("/get").
 				WithHost("httpbin.example").
@@ -534,13 +534,14 @@ spec:
 			By("delete Gateway")
 			err := s.DeleteResource("Gateway", "apisix")
 			Expect(err).NotTo(HaveOccurred(), "deleting Gateway")
-			time.Sleep(5 * time.Second)
 
-			s.NewAPISIXClient().
-				GET("/get").
-				WithHost("httpbin.example").
-				Expect().
-				Status(404)
+			Eventually(func() int {
+				return s.NewAPISIXClient().
+					GET("/get").
+					WithHost("httpbin.example").
+					Expect().
+					Raw().StatusCode
+			}).WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
 		})
 
 		It("Proxy External Service", func() {