fix test

Author: AlinsRan

internal/controller/apisixroute_controller.go

@@ -642,13 +642,20 @@ func (r *ApisixRouteReconciler) listApisixRoutesForPluginConfig(ctx context.Cont
 
 	// First check if the ApisixPluginConfig has matching IngressClassName
 	if pc.Spec.IngressClassName != "" {
-		var ic networkingv1.IngressClass
-		if err := r.Get(ctx, client.ObjectKey{Name: pc.Spec.IngressClassName}, &ic); err != nil {
+		var icObj client.Object
+		switch r.ICGV.String() {
+		case networkingv1beta1.SchemeGroupVersion.String():
+			icObj = &networkingv1beta1.IngressClass{}
+		default:
+			icObj = &networkingv1.IngressClass{}
+		}
+		if err := r.Get(ctx, client.ObjectKey{Name: pc.Spec.IngressClassName}, icObj); err != nil {
 			if client.IgnoreNotFound(err) != nil {
 				r.Log.Error(err, "failed to get IngressClass for ApisixPluginConfig", "pluginconfig", pc.Name)
 			}
 			return nil
 		}
+		ic := convertIngressClass(icObj)
 		if !matchesController(ic.Spec.Controller) {
 			return nil
 		}

test/e2e/crds/v2/globalrule.go

@@ -34,24 +34,23 @@ var _ = Describe("Test GlobalRule", Label("apisix.apache.org", "v2", "apisixglob
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
 
-	var ingressYaml = `
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+	var defaultRoute = `
+apiVersion: apisix.apache.org/v2
+kind: ApisixRoute
 metadata:
-  name: test-ingress
+  name: default
 spec:
   ingressClassName: apisix
-  rules:
-  - host: globalrule.example.com
-    http:
+  http:
+  - name: rule0
+    match:
+      hosts:
+      - globalrule.example.com
       paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: httpbin-service-e2e-test
-            port:
-              number: 80
+      - /*
+    backends:
+    - serviceName: httpbin-service-e2e-test
+      servicePort: 80
 `
 
 	Context("ApisixGlobalRule Basic Operations", func() {
@@ -68,9 +67,9 @@ spec:
 			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
 			time.Sleep(5 * time.Second)
 
-			By("create Ingress")
-			err = s.CreateResourceFromString(ingressYaml)
-			Expect(err).NotTo(HaveOccurred(), "creating Ingress")
+			By("create ApisixRoute")
+			err = s.CreateResourceFromString(defaultRoute)
+			Expect(err).NotTo(HaveOccurred(), "creating ApisixRoute")
 			time.Sleep(5 * time.Second)
 
 			By("verify Ingress works")

test/e2e/crds/v2/status.go

@@ -34,7 +34,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test CRD Status", Label("apisix.apache.org", "v2", "apisixroute"), func() {
+var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org", "v2", "apisixroute"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
@@ -220,147 +220,4 @@ spec:
 				"should not update the same status condition again")
 		})
 	})
-
-	Context("Test HTTPRoute Sync Status", func() {
-		const httproute = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: httpbin
-spec:
-  parentRefs:
-  - name: apisix
-  hostnames:
-  - "httpbin"
-  rules:
-  - matches: 
-    - path:
-        type: Exact
-        value: /get
-    backendRefs:
-    - name: httpbin-service-e2e-test
-      port: 80
-`
-		const gatewayClass = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: GatewayClass
-metadata:
-  name: %s
-spec:
-  controllerName: %s
-`
-		const gatewayProxy = `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: apisix-proxy-config
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      endpoints:
-      - %s
-      auth:
-        type: AdminKey
-        adminKey:
-          value: "%s"
-`
-		const defaultGateway = `
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: apisix
-spec:
-  gatewayClassName: %s
-  listeners:
-    - name: http1
-      protocol: HTTP
-      port: 80
-  infrastructure:
-    parametersRef:
-      group: apisix.apache.org
-      kind: GatewayProxy
-      name: apisix-proxy-config
-`
-		BeforeEach(func() {
-			By("create GatewayProxy")
-			gatewayProxy := fmt.Sprintf(gatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey())
-			err := s.CreateResourceFromString(gatewayProxy)
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
-			time.Sleep(5 * time.Second)
-
-			By("create GatewayClass")
-			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
-			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClass, gatewayClassName, s.GetControllerName()), "")
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
-			time.Sleep(5 * time.Second)
-
-			By("create Gateway")
-			err = s.CreateResourceFromString(fmt.Sprintf(defaultGateway, gatewayClassName))
-			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
-			time.Sleep(5 * time.Second)
-
-			By("check Gateway condition")
-			gwyaml, err := s.GetResourceYaml("Gateway", "apisix")
-			Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
-			Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking Gateway condition status")
-			Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the apisix-ingress-controller"), "checking Gateway condition message")
-		})
-		AfterEach(func() {
-			_ = s.DeleteResource("Gateway", "apisix")
-		})
-
-		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPI7EE {
-				Skip("skip for api7ee mode because it use dashboard admin api")
-			}
-			By("Create HTTPRoute")
-			err := s.CreateResourceFromString(httproute)
-			Expect(err).NotTo(HaveOccurred(), "creating HTTPRoute")
-
-			By("check route in APISIX")
-			s.RequestAssert(&scaffold.RequestAssert{
-				Method: "GET",
-				Path:   "/get",
-				Host:   "httpbin",
-				Check:  scaffold.WithExpectedStatus(200),
-			})
-
-			s.Deployer.ScaleDataplane(0)
-
-			By("check ApisixRoute status")
-			s.RetryAssertion(func() string {
-				output, _ := s.GetOutputFromString("httproute", "httpbin", "-o", "yaml")
-				return output
-			}).WithTimeout(80 * time.Second).
-				Should(
-					And(
-						ContainSubstring(`status: "False"`),
-						ContainSubstring(`reason: SyncFailed`),
-					),
-				)
-
-			s.Deployer.ScaleDataplane(1)
-
-			By("check ApisixRoute status after scaling up")
-			s.RetryAssertion(func() string {
-				output, _ := s.GetOutputFromString("httproute", "httpbin", "-o", "yaml")
-				return output
-			}).WithTimeout(80 * time.Second).
-				Should(
-					And(
-						ContainSubstring(`status: "True"`),
-						ContainSubstring(`reason: Accepted`),
-					),
-				)
-
-			By("check route in APISIX")
-			s.RequestAssert(&scaffold.RequestAssert{
-				Method: "GET",
-				Path:   "/get",
-				Host:   "httpbin",
-				Check:  scaffold.WithExpectedStatus(200),
-			})
-		})
-	})
 })

test/e2e/crds/v2/tls.go

@@ -53,7 +53,7 @@ spec:
 `
 
 const ingressClassYamlTls = `
-apiVersion: networking.k8s.io/v1
+apiVersion: networking.k8s.io/%s
 kind: IngressClass
 metadata:
   name: apisix-tls
@@ -63,8 +63,6 @@ spec:
     apiGroup: "apisix.apache.org"
     kind: "GatewayProxy"
     name: "apisix-proxy-tls"
-    namespace: "default"
-    scope: "Namespace"
 `
 
 const apisixRouteYamlTls = `
@@ -107,7 +105,7 @@ var _ = Describe("Test ApisixTls", Label("apisix.apache.org", "v2", "apisixtls")
 			time.Sleep(5 * time.Second)
 
 			By("create IngressClass")
-			ingressClass := fmt.Sprintf(ingressClassYaml, framework.IngressVersion)
+			ingressClass := fmt.Sprintf(ingressClassYamlTls, framework.IngressVersion)
 			err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
 			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
 			time.Sleep(5 * time.Second)