fix scheme

Signed-off-by: zirain <[email protected]>
envoyproxy · May 7, 2024 · bcd1bf0 · bcd1bf0
1 parent 2146692
commit bcd1bf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/internal/cmd/egctl/status.go b/internal/cmd/egctl/status.go
@@ -141,7 +141,7 @@ func runStatus(ctx context.Context, cli client.Client, resourceType, namespace s
 		resourcesList = &httproute
 
 	case "grpcroute":
-		grpcroute := gwv1a2.GRPCRouteList{}
+		grpcroute := gwv1.GRPCRouteList{}
 		if err := cli.List(ctx, &grpcroute, client.InNamespace(namespace)); err != nil {
 			return err
 		}

diff --git a/internal/envoygateway/scheme.go b/internal/envoygateway/scheme.go
@@ -8,9 +8,7 @@ package envoygateway
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
-	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gwapischeme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme"
 	mcsapi "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
@@ -33,13 +31,7 @@ func init() {
 		panic(err)
 	}
 	// Add Gateway API types.
-	if err := gwapiv1.AddToScheme(scheme); err != nil {
-		panic(err)
-	}
-	if err := gwapiv1b1.AddToScheme(scheme); err != nil {
-		panic(err)
-	}
-	if err := gwapiv1a2.AddToScheme(scheme); err != nil {
+	if err := gwapischeme.AddToScheme(scheme); err != nil {
 		panic(err)
 	}
 	// Add mcs api types.