mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-05 09:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4567 from thameezb/FEAT-update-v1-client-grpcroute

Browse Source 
feat!: update GRPCRoute client from v1alpha2 to stable v1
This commit is contained in:
Kubernetes Prow Robot 2024-07-12 09:48:42 -07:00 committed by GitHub
commit eadce08c09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/gateway_grpcroute.go
View File

@ -20,19 +20,18 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
v1 "sigs.k8s.io/gateway-api/apis/v1" v1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/gateway-api/apis/v1alpha2"
informers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions" informers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"
informers_v1a2 "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/apis/v1alpha2" informers_v1 "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/apis/v1"
) )
// NewGatewayGRPCRouteSource creates a new Gateway GRPCRoute source with the given config. // NewGatewayGRPCRouteSource creates a new Gateway GRPCRoute source with the given config.
func NewGatewayGRPCRouteSource(clients ClientGenerator, config *Config) (Source, error) { func NewGatewayGRPCRouteSource(clients ClientGenerator, config *Config) (Source, error) {
return newGatewayRouteSource(clients, config, "GRPCRoute", func(factory informers.SharedInformerFactory) gatewayRouteInformer { return newGatewayRouteSource(clients, config, "GRPCRoute", func(factory informers.SharedInformerFactory) gatewayRouteInformer {
return &gatewayGRPCRouteInformer{factory.Gateway().V1alpha2().GRPCRoutes()} return &gatewayGRPCRouteInformer{factory.Gateway().V1().GRPCRoutes()}
}) })
} }
type gatewayGRPCRoute struct{ route v1alpha2.GRPCRoute } // NOTE: Must update TypeMeta in List when changing the APIVersion. type gatewayGRPCRoute struct{ route v1.GRPCRoute } // NOTE: Must update TypeMeta in List when changing the APIVersion.
func (rt *gatewayGRPCRoute) Object() kubeObject { return &rt.route } func (rt *gatewayGRPCRoute) Object() kubeObject { return &rt.route }
func (rt *gatewayGRPCRoute) Metadata() *metav1.ObjectMeta { return &rt.route.ObjectMeta } func (rt *gatewayGRPCRoute) Metadata() *metav1.ObjectMeta { return &rt.route.ObjectMeta }
@ -41,7 +40,7 @@ func (rt *gatewayGRPCRoute) Protocol() v1.ProtocolType { return v1.HTTPSProto
func (rt *gatewayGRPCRoute) RouteStatus() v1.RouteStatus { return rt.route.Status.RouteStatus } func (rt *gatewayGRPCRoute) RouteStatus() v1.RouteStatus { return rt.route.Status.RouteStatus }
type gatewayGRPCRouteInformer struct { type gatewayGRPCRouteInformer struct {
informers_v1a2.GRPCRouteInformer informers_v1.GRPCRouteInformer
} }
func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selector) ([]gatewayRoute, error) { func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selector) ([]gatewayRoute, error) {
@ -55,7 +54,7 @@ func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selec
// We make a shallow copy since we're only interested in setting the TypeMeta. // We make a shallow copy since we're only interested in setting the TypeMeta.
clone := *rt clone := *rt
clone.TypeMeta = metav1.TypeMeta{ clone.TypeMeta = metav1.TypeMeta{
APIVersion: v1alpha2.GroupVersion.String(), APIVersion: v1.GroupVersion.String(),
Kind: "GRPCRoute", Kind: "GRPCRoute",
} }
routes[i] = &gatewayGRPCRoute{clone} routes[i] = &gatewayGRPCRoute{clone}

5
source/gateway_grpcroute_test.go
View File

@ -26,7 +26,6 @@ import (
kubefake "k8s.io/client-go/kubernetes/fake" kubefake "k8s.io/client-go/kubernetes/fake"
"sigs.k8s.io/external-dns/endpoint" "sigs.k8s.io/external-dns/endpoint"
v1 "sigs.k8s.io/gateway-api/apis/v1" v1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/gateway-api/apis/v1alpha2"
gatewayfake "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/fake" gatewayfake "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/fake"
) )
@ -64,7 +63,7 @@ func TestGatewayGRPCRouteSourceEndpoints(t *testing.T) {
_, err = gwClient.GatewayV1().Gateways(gw.Namespace).Create(ctx, gw, metav1.CreateOptions{}) _, err = gwClient.GatewayV1().Gateways(gw.Namespace).Create(ctx, gw, metav1.CreateOptions{})
require.NoError(t, err, "failed to create Gateway") require.NoError(t, err, "failed to create Gateway")
rt := &v1alpha2.GRPCRoute{ rt := &v1.GRPCRoute{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "api", Name: "api",
Namespace: "default", Namespace: "default",
@ -79,7 +78,7 @@ func TestGatewayGRPCRouteSourceEndpoints(t *testing.T) {
RouteStatus: gwRouteStatus(gwParentRef("default", "internal")), RouteStatus: gwRouteStatus(gwParentRef("default", "internal")),
}, },
} }
_, err = gwClient.GatewayV1alpha2().GRPCRoutes(rt.Namespace).Create(ctx, rt, metav1.CreateOptions{}) _, err = gwClient.GatewayV1().GRPCRoutes(rt.Namespace).Create(ctx, rt, metav1.CreateOptions{})
require.NoError(t, err, "failed to create GRPCRoute") require.NoError(t, err, "failed to create GRPCRoute")
src, err := NewGatewayGRPCRouteSource(clients, &Config{ src, err := NewGatewayGRPCRouteSource(clients, &Config{