fix test

Author: AlinsRan

internal/controller/gatewayproxy_controller.go

@@ -159,8 +159,8 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	switch r.ICGV.String() {
-	case networkingv1.SchemeGroupVersion.String(), "":
-		var ingressClassList networkingv1.IngressClassList
+	case networkingv1beta1.SchemeGroupVersion.String():
+		var ingressClassList networkingv1beta1.IngressClassList
 		// list IngressClasses that reference the GatewayProxy
 		if err := r.List(ctx, &ingressClassList, client.MatchingFields{indexer.IngressClassParametersRef: indexKey}); err != nil {
 			r.Log.Error(err, "failed to list IngressClassList")
@@ -170,8 +170,8 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 		for _, item := range ingressClassList.Items {
 			tctx.GatewayProxyReferrers[req.NamespacedName] = append(tctx.GatewayProxyReferrers[req.NamespacedName], utils.NamespacedNameKind(&item))
 		}
-	case networkingv1beta1.SchemeGroupVersion.String():
-		var ingressClassList networkingv1beta1.IngressClassList
+	default:
+		var ingressClassList networkingv1.IngressClassList
 		// list IngressClasses that reference the GatewayProxy
 		if err := r.List(ctx, &ingressClassList, client.MatchingFields{indexer.IngressClassParametersRef: indexKey}); err != nil {
 			r.Log.Error(err, "failed to list IngressClassList")

internal/controller/utils.go

@@ -1453,16 +1453,14 @@ func GetIngressClassv1(ctx context.Context, c client.Client, log logr.Logger, in
 
 func GetIngressClass(ctx context.Context, c client.Client, log logr.Logger, ingressClassName string, apiVersion string) (*networkingv1.IngressClass, error) {
 	switch apiVersion {
-	case networkingv1beta1.SchemeGroupVersion.String(), "":
+	case networkingv1beta1.SchemeGroupVersion.String():
 		icBeta, err := GetIngressClassV1Beta1(ctx, c, log, ingressClassName)
 		if err != nil {
 			return nil, err
 		}
 		return convertIngressClass(icBeta), nil
-	case networkingv1.SchemeGroupVersion.String():
-		return GetIngressClassv1(ctx, c, log, ingressClassName)
 	default:
-		return nil, fmt.Errorf("unsupported IngressClass API version: %s", apiVersion)
+		return GetIngressClassv1(ctx, c, log, ingressClassName)
 	}
 }
 

test/e2e/gatewayapi/status.go

@@ -40,61 +40,61 @@ var _ = Describe("Test Gateway API Status", Label("apisix.apache.org", "v2", "ap
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-name: httpbin
+  name: httpbin
 spec:
-parentRefs:
-- name: apisix
-hostnames:
-- "httpbin"
-rules:
-- matches: 
-- path:
-	type: Exact
-	value: /get
-backendRefs:
-- name: httpbin-service-e2e-test
-  port: 80
+  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
+  name: %s
 spec:
-controllerName: %s
+  controllerName: %s
 `
 		const gatewayProxy = `
 apiVersion: apisix.apache.org/v1alpha1
 kind: GatewayProxy
 metadata:
-name: apisix-proxy-config
+  name: apisix-proxy-config
 spec:
-provider:
-type: ControlPlane
-controlPlane:
-  endpoints:
-  - %s
-  auth:
-	type: AdminKey
-	adminKey:
-	  value: "%s"
+  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
+  name: apisix
 spec:
-gatewayClassName: %s
-listeners:
-- name: http1
-  protocol: HTTP
-  port: 80
-infrastructure:
-parametersRef:
-  group: apisix.apache.org
-  kind: GatewayProxy
-  name: apisix-proxy-config
+  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")