Skip to content

Commit 3c5ac53

Browse files
committed
fix gv
1 parent 9c13b5d commit 3c5ac53

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

pkg/controllers/route_controller.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,30 +95,33 @@ func RegisterAllRouteControllers(
9595
}{
9696
{core.HttpRouteType, &gwv1.HTTPRoute{
9797
TypeMeta: metav1.TypeMeta{
98-
APIVersion: "gateway.networking.k8s.io/v1",
98+
APIVersion: gwv1.GroupVersion.String(),
9999
Kind: "HTTPRoute",
100100
},
101101
}},
102102
{core.GrpcRouteType, &gwv1.GRPCRoute{
103103
TypeMeta: metav1.TypeMeta{
104-
APIVersion: "gateway.networking.k8s.io/v1",
104+
APIVersion: gwv1.GroupVersion.String(),
105105
Kind: "GRPCRoute",
106106
},
107107
}},
108108
{core.TlsRouteType, &gwv1alpha2.TLSRoute{
109109
TypeMeta: metav1.TypeMeta{
110-
APIVersion: "gateway.networking.k8s.io/v1alpha2",
110+
APIVersion: gwv1.GroupVersion.String(),
111111
Kind: "TLSRoute",
112112
},
113113
}},
114114
}
115115

116116
for _, routeInfo := range routeInfos {
117-
fmt.Println("groupVersion : ", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Group)
118-
fmt.Println("kind : ", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind)
119-
if ok, err := k8s.IsGVKSupported(mgr, routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Group, routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind); !ok {
120-
fmt.Printf("Route GroupKind %s is not supported, skipping controller registration\n", routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind)
121-
117+
gv := routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().GroupVersion().String()
118+
kind := routeInfo.gatewayApiType.GetObjectKind().GroupVersionKind().Kind
119+
if ok, err := k8s.IsGVKSupported(mgr, gv, kind); !ok {
120+
fmt.Printf("GVK not supported gv: %s, kind: %s", gv, kind)
121+
if err != nil {
122+
fmt.Printf("GVK not supported error: %s", err)
123+
return nil
124+
}
122125
} else {
123126
if err != nil {
124127
return err

0 commit comments

Comments
 (0)