Skip to content

Commit ea1ff95

Browse files
committed
feat: update GRPCRoute client to stable
1 parent 8245b89 commit ea1ff95

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

source/gateway_grpcroute.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@ import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
"k8s.io/apimachinery/pkg/labels"
2222
v1 "sigs.k8s.io/gateway-api/apis/v1"
23-
"sigs.k8s.io/gateway-api/apis/v1alpha2"
2423
informers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"
25-
informers_v1a2 "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/apis/v1alpha2"
24+
informers_v1 "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/apis/v1"
2625
)
2726

2827
// NewGatewayGRPCRouteSource creates a new Gateway GRPCRoute source with the given config.
2928
func NewGatewayGRPCRouteSource(clients ClientGenerator, config *Config) (Source, error) {
3029
return newGatewayRouteSource(clients, config, "GRPCRoute", func(factory informers.SharedInformerFactory) gatewayRouteInformer {
31-
return &gatewayGRPCRouteInformer{factory.Gateway().V1alpha2().GRPCRoutes()}
30+
return &gatewayGRPCRouteInformer{factory.Gateway().V1().GRPCRoutes()}
3231
})
3332
}
3433

35-
type gatewayGRPCRoute struct{ route v1alpha2.GRPCRoute } // NOTE: Must update TypeMeta in List when changing the APIVersion.
34+
type gatewayGRPCRoute struct{ route v1.GRPCRoute } // NOTE: Must update TypeMeta in List when changing the APIVersion.
3635

3736
func (rt *gatewayGRPCRoute) Object() kubeObject { return &rt.route }
3837
func (rt *gatewayGRPCRoute) Metadata() *metav1.ObjectMeta { return &rt.route.ObjectMeta }
@@ -41,7 +40,7 @@ func (rt *gatewayGRPCRoute) Protocol() v1.ProtocolType { return v1.HTTPSProto
4140
func (rt *gatewayGRPCRoute) RouteStatus() v1.RouteStatus { return rt.route.Status.RouteStatus }
4241

4342
type gatewayGRPCRouteInformer struct {
44-
informers_v1a2.GRPCRouteInformer
43+
informers_v1.GRPCRouteInformer
4544
}
4645

4746
func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selector) ([]gatewayRoute, error) {
@@ -55,7 +54,7 @@ func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selec
5554
// We make a shallow copy since we're only interested in setting the TypeMeta.
5655
clone := *rt
5756
clone.TypeMeta = metav1.TypeMeta{
58-
APIVersion: v1alpha2.GroupVersion.String(),
57+
APIVersion: v1.GroupVersion.String(),
5958
Kind: "GRPCRoute",
6059
}
6160
routes[i] = &gatewayGRPCRoute{clone}

source/gateway_grpcroute_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
kubefake "k8s.io/client-go/kubernetes/fake"
2727
"sigs.k8s.io/external-dns/endpoint"
2828
v1 "sigs.k8s.io/gateway-api/apis/v1"
29-
"sigs.k8s.io/gateway-api/apis/v1alpha2"
3029
gatewayfake "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/fake"
3130
)
3231

@@ -64,7 +63,7 @@ func TestGatewayGRPCRouteSourceEndpoints(t *testing.T) {
6463
_, err = gwClient.GatewayV1().Gateways(gw.Namespace).Create(ctx, gw, metav1.CreateOptions{})
6564
require.NoError(t, err, "failed to create Gateway")
6665

67-
rt := &v1alpha2.GRPCRoute{
66+
rt := &v1.GRPCRoute{
6867
ObjectMeta: metav1.ObjectMeta{
6968
Name: "api",
7069
Namespace: "default",
@@ -79,7 +78,7 @@ func TestGatewayGRPCRouteSourceEndpoints(t *testing.T) {
7978
RouteStatus: gwRouteStatus(gwParentRef("default", "internal")),
8079
},
8180
}
82-
_, err = gwClient.GatewayV1alpha2().GRPCRoutes(rt.Namespace).Create(ctx, rt, metav1.CreateOptions{})
81+
_, err = gwClient.GatewayV1().GRPCRoutes(rt.Namespace).Create(ctx, rt, metav1.CreateOptions{})
8382
require.NoError(t, err, "failed to create GRPCRoute")
8483

8584
src, err := NewGatewayGRPCRouteSource(clients, &Config{

0 commit comments

Comments
 (0)