-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gateway-api: upgrade from v0.5.1 to v0.6.0 and add GRPCRoute support
- Loading branch information
1 parent
df8e887
commit a6b7cd0
Showing
10 changed files
with
194 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package source | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| "sigs.k8s.io/gateway-api/apis/v1alpha2" | ||
| "sigs.k8s.io/gateway-api/apis/v1beta1" | ||
| informers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions" | ||
| informers_v1a2 "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/apis/v1alpha2" | ||
| ) | ||
|
|
||
| // NewGatewayGRPCRouteSource creates a new Gateway GRPCRoute source with the given config. | ||
| func NewGatewayGRPCRouteSource(clients ClientGenerator, config *Config) (Source, error) { | ||
| return newGatewayRouteSource(clients, config, "GRPCRoute", func(factory informers.SharedInformerFactory) gatewayRouteInformer { | ||
| return &gatewayGRPCRouteInformer{factory.Gateway().V1alpha2().GRPCRoutes()} | ||
| }) | ||
| } | ||
|
|
||
| type gatewayGRPCRoute struct{ route *v1alpha2.GRPCRoute } | ||
|
|
||
| func (rt *gatewayGRPCRoute) Object() kubeObject { return rt.route } | ||
| func (rt *gatewayGRPCRoute) Metadata() *metav1.ObjectMeta { return &rt.route.ObjectMeta } | ||
| func (rt *gatewayGRPCRoute) Hostnames() []v1beta1.Hostname { return rt.route.Spec.Hostnames } | ||
| func (rt *gatewayGRPCRoute) Protocol() v1beta1.ProtocolType { return v1beta1.HTTPSProtocolType } | ||
| func (rt *gatewayGRPCRoute) RouteStatus() v1beta1.RouteStatus { return rt.route.Status.RouteStatus } | ||
|
|
||
| type gatewayGRPCRouteInformer struct { | ||
| informers_v1a2.GRPCRouteInformer | ||
| } | ||
|
|
||
| func (inf gatewayGRPCRouteInformer) List(namespace string, selector labels.Selector) ([]gatewayRoute, error) { | ||
| list, err := inf.GRPCRouteInformer.Lister().GRPCRoutes(namespace).List(selector) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| routes := make([]gatewayRoute, len(list)) | ||
| for i, rt := range list { | ||
| routes[i] = &gatewayGRPCRoute{rt} | ||
| } | ||
| return routes, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package source | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| kubefake "k8s.io/client-go/kubernetes/fake" | ||
| "sigs.k8s.io/external-dns/endpoint" | ||
| "sigs.k8s.io/gateway-api/apis/v1alpha2" | ||
| "sigs.k8s.io/gateway-api/apis/v1beta1" | ||
| gatewayfake "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/fake" | ||
| ) | ||
|
|
||
| func TestGatewayGRPCRouteSourceEndpoints(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| gwClient := gatewayfake.NewSimpleClientset() | ||
| kubeClient := kubefake.NewSimpleClientset() | ||
| clients := new(MockClientGenerator) | ||
| clients.On("GatewayClient").Return(gwClient, nil) | ||
| clients.On("KubeClient").Return(kubeClient, nil) | ||
|
|
||
| ctx := context.Background() | ||
| ns := &corev1.Namespace{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "default", | ||
| }, | ||
| } | ||
| _, err := kubeClient.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{}) | ||
| require.NoError(t, err, "failed to create Namespace") | ||
|
|
||
| ips := []string{"10.64.0.1", "10.64.0.2"} | ||
| gw := &v1beta1.Gateway{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "internal", | ||
| Namespace: "default", | ||
| }, | ||
| Spec: v1beta1.GatewaySpec{ | ||
| Listeners: []v1beta1.Listener{{ | ||
| Protocol: v1beta1.HTTPSProtocolType, | ||
| }}, | ||
| }, | ||
| Status: gatewayStatus(ips...), | ||
| } | ||
| _, err = gwClient.GatewayV1beta1().Gateways(gw.Namespace).Create(ctx, gw, metav1.CreateOptions{}) | ||
| require.NoError(t, err, "failed to create Gateway") | ||
|
|
||
| rt := &v1alpha2.GRPCRoute{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "api", | ||
| Namespace: "default", | ||
| Annotations: map[string]string{ | ||
| hostnameAnnotationKey: "api-annotation.foobar.internal", | ||
| }, | ||
| }, | ||
| Spec: v1alpha2.GRPCRouteSpec{ | ||
| Hostnames: []v1alpha2.Hostname{"api-hostnames.foobar.internal"}, | ||
| }, | ||
| Status: v1alpha2.GRPCRouteStatus{ | ||
| RouteStatus: v1a2RouteStatus(v1a2ParentRef("default", "internal")), | ||
| }, | ||
| } | ||
| _, err = gwClient.GatewayV1alpha2().GRPCRoutes(rt.Namespace).Create(ctx, rt, metav1.CreateOptions{}) | ||
| require.NoError(t, err, "failed to create GRPCRoute") | ||
|
|
||
| src, err := NewGatewayGRPCRouteSource(clients, &Config{ | ||
| FQDNTemplate: "{{.Name}}-template.foobar.internal", | ||
| CombineFQDNAndAnnotation: true, | ||
| }) | ||
| require.NoError(t, err, "failed to create Gateway GRPCRoute Source") | ||
|
|
||
| endpoints, err := src.Endpoints(ctx) | ||
| require.NoError(t, err, "failed to get Endpoints") | ||
| validateEndpoints(t, endpoints, []*endpoint.Endpoint{ | ||
| newTestEndpoint("api-annotation.foobar.internal", "A", ips...), | ||
| newTestEndpoint("api-hostnames.foobar.internal", "A", ips...), | ||
| newTestEndpoint("api-template.foobar.internal", "A", ips...), | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.