homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: upgrade gateway api to v1.0.0

Browse source
This commit is contained in:
Michael 2024-01-09 10:28:05 +01:00 • committed by GitHub
parent 4ddef9830b
commit fea94a3393
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 15229 additions and 4466 deletions
Download patch file Download diff file Expand all files Collapse all files

51
pkg/provider/kubernetes/gateway/client.go
View file

@ -16,9 +16,10 @@ import (
kclientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
gatev1 "sigs.k8s.io/gateway-api/apis/v1"
gatev1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
gateclientset "sigs.k8s.io/gateway-api/pkg/client/clientset/gateway/versioned"
gateinformers "sigs.k8s.io/gateway-api/pkg/client/informers/gateway/externalversions"
gateclientset "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned"
gateinformers "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"
)
const resyncPeriod = 10 * time.Minute
@ -27,13 +28,13 @@ type resourceEventHandler struct {
ev chan<- interface{}
}
func (reh *resourceEventHandler) OnAdd(obj interface{}) {
func (reh *resourceEventHandler) OnAdd(obj interface{}, isInInitialList bool) {
eventHandlerFunc(reh.ev, obj)
}
func (reh *resourceEventHandler) OnUpdate(oldObj, newObj interface{}) {
switch oldObj.(type) {
case *gatev1alpha2.GatewayClass:
case *gatev1.GatewayClass:
// Skip update for gateway classes. We only manage addition or deletion for this cluster-wide resource.
return
default:
@ -50,11 +51,11 @@ func (reh *resourceEventHandler) OnDelete(obj interface{}) {
// The stores can then be accessed via the Get* functions.
type Client interface {
WatchAll(namespaces []string, stopCh <-chan struct{}) (<-chan interface{}, error)
GetGatewayClasses() ([]*gatev1alpha2.GatewayClass, error)
UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatewayStatus gatev1alpha2.GatewayStatus) error
UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.GatewayClass, condition metav1.Condition) error
GetGateways() []*gatev1alpha2.Gateway
GetHTTPRoutes(namespaces []string) ([]*gatev1alpha2.HTTPRoute, error)
GetGatewayClasses() ([]*gatev1.GatewayClass, error)
UpdateGatewayStatus(gateway *gatev1.Gateway, gatewayStatus gatev1.GatewayStatus) error
UpdateGatewayClassStatus(gatewayClass *gatev1.GatewayClass, condition metav1.Condition) error
GetGateways() []*gatev1.Gateway
GetHTTPRoutes(namespaces []string) ([]*gatev1.HTTPRoute, error)
GetTCPRoutes(namespaces []string) ([]*gatev1alpha2.TCPRoute, error)
GetTLSRoutes(namespaces []string) ([]*gatev1alpha2.TLSRoute, error)
GetService(namespace, name string) (*corev1.Service, bool, error)
@ -177,7 +178,7 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (<
}
c.factoryGatewayClass = gateinformers.NewSharedInformerFactoryWithOptions(c.csGateway, resyncPeriod, gateinformers.WithTweakListOptions(labelSelectorOptions))
_, err = c.factoryGatewayClass.Gateway().V1alpha2().GatewayClasses().Informer().AddEventHandler(eventHandler)
_, err = c.factoryGatewayClass.Gateway().V1().GatewayClasses().Informer().AddEventHandler(eventHandler)
if err != nil {
return nil, err
}
@ -187,11 +188,11 @@ func (c *clientWrapper) WatchAll(namespaces []string, stopCh <-chan struct{}) (<
for _, ns := range namespaces {
factoryGateway := gateinformers.NewSharedInformerFactoryWithOptions(c.csGateway, resyncPeriod, gateinformers.WithNamespace(ns))
_, err = factoryGateway.Gateway().V1alpha2().Gateways().Informer().AddEventHandler(eventHandler)
_, err = factoryGateway.Gateway().V1().Gateways().Informer().AddEventHandler(eventHandler)
if err != nil {
return nil, err
}
_, err = factoryGateway.Gateway().V1alpha2().HTTPRoutes().Informer().AddEventHandler(eventHandler)
_, err = factoryGateway.Gateway().V1().HTTPRoutes().Informer().AddEventHandler(eventHandler)
if err != nil {
return nil, err
}
@ -286,15 +287,15 @@ func (c *clientWrapper) GetNamespaces(selector labels.Selector) ([]string, error
return namespaces, nil
}
func (c *clientWrapper) GetHTTPRoutes(namespaces []string) ([]*gatev1alpha2.HTTPRoute, error) {
var httpRoutes []*gatev1alpha2.HTTPRoute
func (c *clientWrapper) GetHTTPRoutes(namespaces []string) ([]*gatev1.HTTPRoute, error) {
var httpRoutes []*gatev1.HTTPRoute
for _, namespace := range namespaces {
if !c.isWatchedNamespace(namespace) {
log.Warn().Msgf("Failed to get HTTPRoutes: %q is not within watched namespaces", namespace)
continue
}
routes, err := c.factoriesGateway[c.lookupNamespace(namespace)].Gateway().V1alpha2().HTTPRoutes().Lister().HTTPRoutes(namespace).List(labels.Everything())
routes, err := c.factoriesGateway[c.lookupNamespace(namespace)].Gateway().V1().HTTPRoutes().Lister().HTTPRoutes(namespace).List(labels.Everything())
if err != nil {
return nil, err
}
@ -356,11 +357,11 @@ func (c *clientWrapper) GetTLSRoutes(namespaces []string) ([]*gatev1alpha2.TLSRo
return tlsRoutes, nil
}
func (c *clientWrapper) GetGateways() []*gatev1alpha2.Gateway {
var result []*gatev1alpha2.Gateway
func (c *clientWrapper) GetGateways() []*gatev1.Gateway {
var result []*gatev1.Gateway
for ns, factory := range c.factoriesGateway {
gateways, err := factory.Gateway().V1alpha2().Gateways().Lister().List(labels.Everything())
gateways, err := factory.Gateway().V1().Gateways().Lister().List(labels.Everything())
if err != nil {
log.Error().Err(err).Msgf("Failed to list Gateways in namespace %s", ns)
continue
@ -371,11 +372,11 @@ func (c *clientWrapper) GetGateways() []*gatev1alpha2.Gateway {
return result
}
func (c *clientWrapper) GetGatewayClasses() ([]*gatev1alpha2.GatewayClass, error) {
return c.factoryGatewayClass.Gateway().V1alpha2().GatewayClasses().Lister().List(labels.Everything())
func (c *clientWrapper) GetGatewayClasses() ([]*gatev1.GatewayClass, error) {
return c.factoryGatewayClass.Gateway().V1().GatewayClasses().Lister().List(labels.Everything())
}
func (c *clientWrapper) UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.GatewayClass, condition metav1.Condition) error {
func (c *clientWrapper) UpdateGatewayClassStatus(gatewayClass *gatev1.GatewayClass, condition metav1.Condition) error {
gc := gatewayClass.DeepCopy()
var newConditions []metav1.Condition
@ -398,7 +399,7 @@ func (c *clientWrapper) UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.Gate
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
_, err := c.csGateway.GatewayV1alpha2().GatewayClasses().UpdateStatus(ctx, gc, metav1.UpdateOptions{})
_, err := c.csGateway.GatewayV1().GatewayClasses().UpdateStatus(ctx, gc, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update GatewayClass %q status: %w", gatewayClass.Name, err)
}
@ -406,7 +407,7 @@ func (c *clientWrapper) UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.Gate
return nil
}
func (c *clientWrapper) UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatewayStatus gatev1alpha2.GatewayStatus) error {
func (c *clientWrapper) UpdateGatewayStatus(gateway *gatev1.Gateway, gatewayStatus gatev1.GatewayStatus) error {
if !c.isWatchedNamespace(gateway.Namespace) {
return fmt.Errorf("cannot update Gateway status %s/%s: namespace is not within watched namespaces", gateway.Namespace, gateway.Name)
}
@ -421,7 +422,7 @@ func (c *clientWrapper) UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatew
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
_, err := c.csGateway.GatewayV1alpha2().Gateways(gateway.Namespace).UpdateStatus(ctx, g, metav1.UpdateOptions{})
_, err := c.csGateway.GatewayV1().Gateways(gateway.Namespace).UpdateStatus(ctx, g, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update Gateway %q status: %w", gateway.Name, err)
}
@ -429,7 +430,7 @@ func (c *clientWrapper) UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatew
return nil
}
func statusEquals(oldStatus, newStatus gatev1alpha2.GatewayStatus) bool {
func statusEquals(oldStatus, newStatus gatev1.GatewayStatus) bool {
if len(oldStatus.Listeners) != len(newStatus.Listeners) {
return false
}

32
pkg/provider/kubernetes/gateway/client_mock_test.go
View file

@ -10,6 +10,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
kscheme "k8s.io/client-go/kubernetes/scheme"
gatev1 "sigs.k8s.io/gateway-api/apis/v1"
gatev1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
)
@ -21,6 +22,11 @@ func init() {
if err != nil {
panic(err)
}
err = gatev1.AddToScheme(kscheme.Scheme)
if err != nil {
panic(err)
}
}
type clientMock struct {
@ -33,9 +39,9 @@ type clientMock struct {
apiSecretError error
apiEndpointsError error
gatewayClasses []*gatev1alpha2.GatewayClass
gateways []*gatev1alpha2.Gateway
httpRoutes []*gatev1alpha2.HTTPRoute
gatewayClasses []*gatev1.GatewayClass
gateways []*gatev1.Gateway
httpRoutes []*gatev1.HTTPRoute
tcpRoutes []*gatev1alpha2.TCPRoute
tlsRoutes []*gatev1alpha2.TLSRoute
@ -62,11 +68,11 @@ func newClientMock(paths ...string) clientMock {
c.namespaces = append(c.namespaces, o)
case *corev1.Endpoints:
c.endpoints = append(c.endpoints, o)
case *gatev1alpha2.GatewayClass:
case *gatev1.GatewayClass:
c.gatewayClasses = append(c.gatewayClasses, o)
case *gatev1alpha2.Gateway:
case *gatev1.Gateway:
c.gateways = append(c.gateways, o)
case *gatev1alpha2.HTTPRoute:
case *gatev1.HTTPRoute:
c.httpRoutes = append(c.httpRoutes, o)
case *gatev1alpha2.TCPRoute:
c.tcpRoutes = append(c.tcpRoutes, o)
@ -81,7 +87,7 @@ func newClientMock(paths ...string) clientMock {
return c
}
func (c clientMock) UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatewayStatus gatev1alpha2.GatewayStatus) error {
func (c clientMock) UpdateGatewayStatus(gateway *gatev1.Gateway, gatewayStatus gatev1.GatewayStatus) error {
for _, g := range c.gateways {
if g.Name == gateway.Name {
if !statusEquals(g.Status, gatewayStatus) {
@ -94,7 +100,7 @@ func (c clientMock) UpdateGatewayStatus(gateway *gatev1alpha2.Gateway, gatewaySt
return nil
}
func (c clientMock) UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.GatewayClass, condition metav1.Condition) error {
func (c clientMock) UpdateGatewayClassStatus(gatewayClass *gatev1.GatewayClass, condition metav1.Condition) error {
for _, gc := range c.gatewayClasses {
if gc.Name == gatewayClass.Name {
for _, c := range gc.Status.Conditions {
@ -110,7 +116,7 @@ func (c clientMock) UpdateGatewayClassStatus(gatewayClass *gatev1alpha2.GatewayC
return nil
}
func (c clientMock) UpdateGatewayStatusConditions(gateway *gatev1alpha2.Gateway, condition metav1.Condition) error {
func (c clientMock) UpdateGatewayStatusConditions(gateway *gatev1.Gateway, condition metav1.Condition) error {
for _, g := range c.gatewayClasses {
if g.Name == gateway.Name {
for _, c := range g.Status.Conditions {
@ -126,11 +132,11 @@ func (c clientMock) UpdateGatewayStatusConditions(gateway *gatev1alpha2.Gateway,
return nil
}
func (c clientMock) GetGatewayClasses() ([]*gatev1alpha2.GatewayClass, error) {
func (c clientMock) GetGatewayClasses() ([]*gatev1.GatewayClass, error) {
return c.gatewayClasses, nil
}
func (c clientMock) GetGateways() []*gatev1alpha2.Gateway {
func (c clientMock) GetGateways() []*gatev1.Gateway {
return c.gateways
}
@ -148,8 +154,8 @@ func (c clientMock) GetNamespaces(selector labels.Selector) ([]string, error) {
return ns, nil
}
func (c clientMock) GetHTTPRoutes(namespaces []string) ([]*gatev1alpha2.HTTPRoute, error) {
var httpRoutes []*gatev1alpha2.HTTPRoute
func (c clientMock) GetHTTPRoutes(namespaces []string) ([]*gatev1.HTTPRoute, error) {
var httpRoutes []*gatev1.HTTPRoute
for _, namespace := range namespaces {
for _, httpRoute := range c.httpRoutes {
if inNamespace(httpRoute.ObjectMeta, namespace) {

70
pkg/provider/kubernetes/gateway/client_test.go
View file

@ -5,32 +5,32 @@ import (
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
gatev1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
gatev1 "sigs.k8s.io/gateway-api/apis/v1"
)
func TestStatusEquals(t *testing.T) {
testCases := []struct {
desc string
statusA gatev1alpha2.GatewayStatus
statusB gatev1alpha2.GatewayStatus
statusA gatev1.GatewayStatus
statusB gatev1.GatewayStatus
expected bool
}{
{
desc: "Empty",
statusA: gatev1alpha2.GatewayStatus{},
statusB: gatev1alpha2.GatewayStatus{},
statusA: gatev1.GatewayStatus{},
statusB: gatev1.GatewayStatus{},
expected: true,
},
{
desc: "Same status",
statusA: gatev1alpha2.GatewayStatus{
statusA: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobar",
Reason: "foobar",
},
},
Listeners: []gatev1alpha2.ListenerStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "foo",
Conditions: []metav1.Condition{
@ -42,14 +42,14 @@ func TestStatusEquals(t *testing.T) {
},
},
},
statusB: gatev1alpha2.GatewayStatus{
statusB: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobar",
Reason: "foobar",
},
},
Listeners: []gatev1alpha2.ListenerStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "foo",
Conditions: []metav1.Condition{
@ -65,11 +65,11 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Listeners length not equal",
statusA: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{},
statusA: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{},
},
statusB: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusB: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{},
},
},
@ -77,10 +77,10 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway conditions length not equal",
statusA: gatev1alpha2.GatewayStatus{
statusA: gatev1.GatewayStatus{
Conditions: []metav1.Condition{},
},
statusB: gatev1alpha2.GatewayStatus{
statusB: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{},
},
@ -89,14 +89,14 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway conditions different types",
statusA: gatev1alpha2.GatewayStatus{
statusA: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobar",
},
},
},
statusB: gatev1alpha2.GatewayStatus{
statusB: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobir",
@ -107,14 +107,14 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway conditions same types but different reason",
statusA: gatev1alpha2.GatewayStatus{
statusA: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobar",
},
},
},
statusB: gatev1alpha2.GatewayStatus{
statusB: gatev1.GatewayStatus{
Conditions: []metav1.Condition{
{
Type: "foobar",
@ -126,16 +126,16 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway listeners conditions length",
statusA: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusA: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "foo",
Conditions: []metav1.Condition{},
},
},
},
statusB: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusB: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "foo",
Conditions: []metav1.Condition{
@ -148,8 +148,8 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway listeners conditions same types but different status",
statusA: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusA: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Conditions: []metav1.Condition{
{
@ -159,8 +159,8 @@ func TestStatusEquals(t *testing.T) {
},
},
},
statusB: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusB: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Conditions: []metav1.Condition{
{
@ -175,8 +175,8 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway listeners conditions same types but different message",
statusA: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusA: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Conditions: []metav1.Condition{
{
@ -186,8 +186,8 @@ func TestStatusEquals(t *testing.T) {
},
},
},
statusB: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusB: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Conditions: []metav1.Condition{
{
@ -202,8 +202,8 @@ func TestStatusEquals(t *testing.T) {
},
{
desc: "Gateway listeners conditions same types/reason but different names",
statusA: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusA: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "foo",
Conditions: []metav1.Condition{
@ -215,8 +215,8 @@ func TestStatusEquals(t *testing.T) {
},
},
},
statusB: gatev1alpha2.GatewayStatus{
Listeners: []gatev1alpha2.ListenerStatus{
statusB: gatev1.GatewayStatus{
Listeners: []gatev1.ListenerStatus{
{
Name: "bar",
Conditions: []metav1.Condition{

6
pkg/provider/kubernetes/gateway/fixtures/httproute/filter_http_to_https.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/filter_http_to_https_with_hostname_and_port.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/gatewayclass_with_unknown_controller.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/one_rule_two_targets.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/simple.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/simple_cross_provider.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/simple_to_api_internal.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/simple_with_bad_rule.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/simple_with_tls_entrypoint.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/two_rules.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_multiple_host.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

8
pkg/provider/kubernetes/gateway/fixtures/httproute/with_namespace_all.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -49,7 +49,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

8
pkg/provider/kubernetes/gateway/fixtures/httproute/with_namespace_same.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -49,7 +49,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

8
pkg/provider/kubernetes/gateway/fixtures/httproute/with_namespace_selector.yml
View file

@ -8,7 +8,7 @@ metadata:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -16,7 +16,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -35,7 +35,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -60,7 +60,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_protocol_https.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -40,7 +40,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_protocol_https_with_tls_passthrough.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -40,7 +40,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_protocol_https_without_tls.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_protocol_tcp.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_protocol_tls.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -40,7 +40,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_several_rules.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/httproute/with_tls_configuration.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

8
pkg/provider/kubernetes/gateway/fixtures/httproute/with_two_gateways_one_httproute.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-https
namespace: default
@ -40,7 +40,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-http
namespace: default
@ -56,7 +56,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_two_listeners_one_httproute.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -47,7 +47,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/httproute/with_wrong_service_port.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/httproute/without_gatewayclass.yml
View file

@ -1,6 +1,6 @@
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -16,7 +16,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/httproute/without_httproute.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/mixed/simple.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -92,7 +92,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/mixed/with_bad_listener_protocol.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/mixed/with_bad_listener_route_kind.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/mixed/with_core_group.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -79,7 +79,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/mixed/with_incompatible_protocol_and_route_kind.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -27,7 +27,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

12
pkg/provider/kubernetes/gateway/fixtures/mixed/with_multiple_listeners_using_same_hostname_port_protocol.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-http
namespace: default
@ -49,7 +49,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-tcp
namespace: default
@ -77,7 +77,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-tls
namespace: default
@ -113,7 +113,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default
@ -128,7 +128,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-2
namespace: default

8
pkg/provider/kubernetes/gateway/fixtures/mixed/with_namespace_all.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -92,7 +92,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -160,7 +160,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

8
pkg/provider/kubernetes/gateway/fixtures/mixed/with_namespace_same.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -92,7 +92,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -160,7 +160,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

8
pkg/provider/kubernetes/gateway/fixtures/mixed/with_namespace_selector.yml
View file

@ -30,7 +30,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -38,7 +38,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -126,7 +126,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-default
namespace: default
@ -194,7 +194,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-bar
namespace: bar

6
pkg/provider/kubernetes/gateway/fixtures/mixed/with_wrong_routes_selector.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-mixed-gateway
namespace: default
@ -74,7 +74,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/gatewayclass_with_unknown_controller.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/simple.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/simple_cross_provider.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_multiple_routes.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_multiple_rules.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_namespace_all.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_namespace_same.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_namespace_selector.yml
View file

@ -8,7 +8,7 @@ metadata:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -17,7 +17,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tcp-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_protocol_http.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_protocol_https.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_protocol_tls.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_tls_configuration.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/with_wrong_service_port.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

2
pkg/provider/kubernetes/gateway/fixtures/tcproute/without_gatewayclass.yml
View file

@ -1,6 +1,6 @@
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/without_tcproute.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tcproute/without_tcproute_tls_protocol.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/gatewayclass_with_unknown_controller.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/simple_TLS_to_TCPRoute.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -20,7 +20,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tls-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/simple_TLS_to_TCPRoute_passthrough.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tls-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/simple_TLS_to_TLSRoute.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -20,7 +20,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tls-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/simple_cross_provider.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_SNI_matching.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_invalid_SNI_matching.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_multiple_SNI_matching.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_multiple_routes_kind.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -20,7 +20,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-tls-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_multiple_rules.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
namespace: default
@ -9,7 +9,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_namespace_all.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_namespace_same.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_namespace_selector.yml
View file

@ -8,7 +8,7 @@ metadata:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -16,7 +16,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_passthrough.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_passthrough_tls.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_protocol_http.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_protocol_https.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_protocol_tcp.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/with_wrong_service_port.yml
View file

@ -11,7 +11,7 @@ data:
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -19,7 +19,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

2
pkg/provider/kubernetes/gateway/fixtures/tlsroute/without_gatewayclass.yml
View file

@ -1,6 +1,6 @@
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

4
pkg/provider/kubernetes/gateway/fixtures/tlsroute/without_tlsroute.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/with_two_hosts_one_wildcard.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

6
pkg/provider/kubernetes/gateway/fixtures/with_two_hosts_wildcard.yml
View file

@ -1,6 +1,6 @@
---
kind: GatewayClass
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway-class
spec:
@ -8,7 +8,7 @@ spec:
---
kind: Gateway
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: my-gateway
namespace: default
@ -24,7 +24,7 @@ spec:
---
kind: HTTPRoute
apiVersion: gateway.networking.k8s.io/v1alpha2
apiVersion: gateway.networking.k8s.io/v1
metadata:
name: http-app-1
namespace: default

288
pkg/provider/kubernetes/gateway/kubernetes.go
View file

@ -30,9 +30,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"k8s.io/utils/strings/slices"
gatev1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
gatev1 "sigs.k8s.io/gateway-api/apis/v1"
)
const (
@ -64,7 +64,7 @@ func (p *Provider) SetRouterTransform(routerTransform k8s.RouterTransform) {
p.routerTransform = routerTransform
}
func (p *Provider) applyRouterTransform(ctx context.Context, rt *dynamic.Router, route *gatev1alpha2.HTTPRoute) {
func (p *Provider) applyRouterTransform(ctx context.Context, rt *dynamic.Router, route *gatev1.HTTPRoute) {
if p.routerTransform == nil {
return
}
@ -227,14 +227,14 @@ func (p *Provider) loadConfigurationFromGateway(ctx context.Context, client Clie
gatewayClassNames[gatewayClass.Name] = struct{}{}
err := client.UpdateGatewayClassStatus(gatewayClass, metav1.Condition{
Type: string(gatev1alpha2.GatewayClassConditionStatusAccepted),
Type: string(gatev1.GatewayClassConditionStatusAccepted),
Status: metav1.ConditionTrue,
Reason: "Handled",
Message: "Handled by Traefik controller",
LastTransitionTime: metav1.Now(),
})
if err != nil {
logger.Error().Err(err).Msgf("Failed to update %s condition", gatev1alpha2.GatewayClassConditionStatusAccepted)
logger.Error().Err(err).Msgf("Failed to update %s condition", gatev1.GatewayClassConditionStatusAccepted)
}
}
}
@ -290,7 +290,7 @@ func (p *Provider) loadConfigurationFromGateway(ctx context.Context, client Clie
return conf
}
func (p *Provider) createGatewayConf(ctx context.Context, client Client, gateway *gatev1alpha2.Gateway) (*dynamic.Configuration, error) {
func (p *Provider) createGatewayConf(ctx context.Context, client Client, gateway *gatev1.Gateway) (*dynamic.Configuration, error) {
conf := &dynamic.Configuration{
HTTP: &dynamic.HTTPConfiguration{
Routers: map[string]*dynamic.Router{},
@ -318,7 +318,7 @@ func (p *Provider) createGatewayConf(ctx context.Context, client Client, gateway
// and cannot be configured on the Gateway.
listenerStatuses := p.fillGatewayConf(ctx, client, gateway, conf, tlsConfigs)
gatewayStatus, errG := p.makeGatewayStatus(listenerStatuses)
gatewayStatus, errG := p.makeGatewayStatus(gateway, listenerStatuses)
err := client.UpdateGatewayStatus(gateway, gatewayStatus)
if err != nil {
@ -336,15 +336,15 @@ func (p *Provider) createGatewayConf(ctx context.Context, client Client, gateway
return conf, nil
}
func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *gatev1alpha2.Gateway, conf *dynamic.Configuration, tlsConfigs map[string]*tls.CertAndStores) []gatev1alpha2.ListenerStatus {
func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *gatev1.Gateway, conf *dynamic.Configuration, tlsConfigs map[string]*tls.CertAndStores) []gatev1.ListenerStatus {
logger := log.Ctx(ctx)
listenerStatuses := make([]gatev1alpha2.ListenerStatus, len(gateway.Spec.Listeners))
listenerStatuses := make([]gatev1.ListenerStatus, len(gateway.Spec.Listeners))
allocatedListeners := make(map[string]struct{})
for i, listener := range gateway.Spec.Listeners {
listenerStatuses[i] = gatev1alpha2.ListenerStatus{
listenerStatuses[i] = gatev1.ListenerStatus{
Name: listener.Name,
SupportedKinds: []gatev1alpha2.RouteGroupKind{},
SupportedKinds: []gatev1.RouteGroupKind{},
Conditions: []metav1.Condition{},
}
@ -356,7 +356,7 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
listenerStatuses[i].SupportedKinds = supportedKinds
routeKinds, conditions := getAllowedRouteKinds(listener, supportedKinds)
routeKinds, conditions := getAllowedRouteKinds(gateway, listener, supportedKinds)
if len(conditions) > 0 {
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, conditions...)
continue
@ -366,8 +366,9 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
if _, ok := allocatedListeners[listenerKey]; ok {
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionConflicted),
Type: string(gatev1.ListenerConditionConflicted),
Status: metav1.ConditionTrue,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "DuplicateListener",
Message: "A listener with same protocol, port and hostname already exists",
@ -382,20 +383,22 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
if err != nil {
// update "Detached" status with "PortUnavailable" reason
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionDetached),
Status: metav1.ConditionTrue,
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonPortUnavailable),
Reason: string(gatev1.ListenerReasonPortUnavailable),
Message: fmt.Sprintf("Cannot find entryPoint for Gateway: %v", err),
})
continue
}
if (listener.Protocol == gatev1alpha2.HTTPProtocolType || listener.Protocol == gatev1alpha2.TCPProtocolType) && listener.TLS != nil {
if (listener.Protocol == gatev1.HTTPProtocolType || listener.Protocol == gatev1.TCPProtocolType) && listener.TLS != nil {
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionDetached),
Status: metav1.ConditionTrue,
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidTLSConfiguration", // TODO check the spec if a proper reason is introduced at some point
Message: "TLS configuration must no be defined when using HTTP or TCP protocol",
@ -405,12 +408,13 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
}
// TLS
if listener.Protocol == gatev1alpha2.HTTPSProtocolType || listener.Protocol == gatev1alpha2.TLSProtocolType {
if listener.TLS == nil || (len(listener.TLS.CertificateRefs) == 0 && listener.TLS.Mode != nil && *listener.TLS.Mode != gatev1alpha2.TLSModePassthrough) {
if listener.Protocol == gatev1.HTTPSProtocolType || listener.Protocol == gatev1.TLSProtocolType {
if listener.TLS == nil || (len(listener.TLS.CertificateRefs) == 0 && listener.TLS.Mode != nil && *listener.TLS.Mode != gatev1.TLSModePassthrough) {
// update "Detached" status with "UnsupportedProtocol" reason
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionDetached),
Status: metav1.ConditionTrue,
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidTLSConfiguration", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("No TLS configuration for Gateway Listener %s:%d and protocol %q",
@ -420,12 +424,12 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
continue
}
var tlsModeType gatev1alpha2.TLSModeType
var tlsModeType gatev1.TLSModeType
if listener.TLS.Mode != nil {
tlsModeType = *listener.TLS.Mode
}
isTLSPassthrough := tlsModeType == gatev1alpha2.TLSModePassthrough
isTLSPassthrough := tlsModeType == gatev1.TLSModePassthrough
if isTLSPassthrough && len(listener.TLS.CertificateRefs) > 0 {
// https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.GatewayTLSConfig
@ -436,12 +440,13 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
// Protocol TLS -> Passthrough -> TLSRoute/TCPRoute
// Protocol TLS -> Terminate -> TLSRoute/TCPRoute
// Protocol HTTPS -> Terminate -> HTTPRoute
if listener.Protocol == gatev1alpha2.HTTPSProtocolType && isTLSPassthrough {
if listener.Protocol == gatev1.HTTPSProtocolType && isTLSPassthrough {
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionDetached),
Status: metav1.ConditionTrue,
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonUnsupportedProtocol),
Reason: string(gatev1.ListenerReasonUnsupportedProtocol),
Message: "HTTPS protocol is not supported with TLS mode Passthrough",
})
@ -452,10 +457,11 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
if len(listener.TLS.CertificateRefs) == 0 {
// update "ResolvedRefs" status true with "InvalidCertificateRef" reason
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonInvalidCertificateRef),
Reason: string(gatev1.ListenerReasonInvalidCertificateRef),
Message: "One TLS CertificateRef is required in Terminate mode",
})
@ -469,10 +475,11 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
certificateRef.Group == nil || (*certificateRef.Group != "" && *certificateRef.Group != "core") {
// update "ResolvedRefs" status true with "InvalidCertificateRef" reason
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonInvalidCertificateRef),
Reason: string(gatev1.ListenerReasonInvalidCertificateRef),
Message: fmt.Sprintf("Unsupported TLS CertificateRef group/kind: %v/%v", certificateRef.Group, certificateRef.Kind),
})
@ -482,10 +489,11 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
// TODO Support ReferencePolicy to support cross namespace references.
if certificateRef.Namespace != nil && string(*certificateRef.Namespace) != gateway.Namespace {
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonInvalidCertificateRef),
Reason: string(gatev1.ListenerReasonInvalidCertificateRef),
Message: "Cross namespace secrets are not supported",
})
@ -498,10 +506,11 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
if err != nil {
// update "ResolvedRefs" status true with "InvalidCertificateRef" reason
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonInvalidCertificateRef),
Reason: string(gatev1.ListenerReasonInvalidCertificateRef),
Message: fmt.Sprintf("Error while retrieving certificate: %v", err),
})
@ -528,10 +537,10 @@ func (p *Provider) fillGatewayConf(ctx context.Context, client Client, gateway *
return listenerStatuses
}
func (p *Provider) makeGatewayStatus(listenerStatuses []gatev1alpha2.ListenerStatus) (gatev1alpha2.GatewayStatus, error) {
func (p *Provider) makeGatewayStatus(gateway *gatev1.Gateway, listenerStatuses []gatev1.ListenerStatus) (gatev1.GatewayStatus, error) {
// As Status.Addresses are not implemented yet, we initialize an empty array to follow the API expectations.
gatewayStatus := gatev1alpha2.GatewayStatus{
Addresses: []gatev1alpha2.GatewayAddress{},
gatewayStatus := gatev1.GatewayStatus{
Addresses: []gatev1.GatewayStatusAddress{},
}
var result error
@ -539,8 +548,9 @@ func (p *Provider) makeGatewayStatus(listenerStatuses []gatev1alpha2.ListenerSta
if len(listener.Conditions) == 0 {
// GatewayConditionReady "Ready", GatewayConditionReason "ListenerReady"
listenerStatuses[i].Conditions = append(listenerStatuses[i].Conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionReady),
Type: string(gatev1.ListenerReasonAccepted),
Status: metav1.ConditionTrue,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "ListenerReady",
Message: "No error found",
@ -557,10 +567,11 @@ func (p *Provider) makeGatewayStatus(listenerStatuses []gatev1alpha2.ListenerSta
if result != nil {
// GatewayConditionReady "Ready", GatewayConditionReason "ListenersNotValid"
gatewayStatus.Conditions = append(gatewayStatus.Conditions, metav1.Condition{
Type: string(gatev1alpha2.GatewayConditionReady),
Type: string(gatev1.GatewayConditionAccepted),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.GatewayReasonListenersNotValid),
Reason: string(gatev1.GatewayReasonListenersNotValid),
Message: "All Listeners must be valid",
})
@ -570,20 +581,13 @@ func (p *Provider) makeGatewayStatus(listenerStatuses []gatev1alpha2.ListenerSta
gatewayStatus.Listeners = listenerStatuses
gatewayStatus.Conditions = append(gatewayStatus.Conditions,
// update "Scheduled" status with "ResourcesAvailable" reason
// update "Accepted" status with "Accepted" reason
metav1.Condition{
Type: string(gatev1alpha2.GatewayConditionScheduled),
Type: string(gatev1.GatewayConditionAccepted),
Status: metav1.ConditionTrue,
Reason: "ResourcesAvailable",
Message: "Resources available",
LastTransitionTime: metav1.Now(),
},
// update "Ready" status with "ListenersValid" reason
metav1.Condition{
Type: string(gatev1alpha2.GatewayConditionReady),
Status: metav1.ConditionTrue,
Reason: "ListenersValid",
Message: "Listeners valid",
ObservedGeneration: gateway.Generation,
Reason: string(gatev1.GatewayConditionAccepted),
Message: "Gateway successfully scheduled",
LastTransitionTime: metav1.Now(),
},
)
@ -591,14 +595,14 @@ func (p *Provider) makeGatewayStatus(listenerStatuses []gatev1alpha2.ListenerSta
return gatewayStatus, nil
}
func (p *Provider) entryPointName(port gatev1alpha2.PortNumber, protocol gatev1alpha2.ProtocolType) (string, error) {
func (p *Provider) entryPointName(port gatev1.PortNumber, protocol gatev1.ProtocolType) (string, error) {
portStr := strconv.FormatInt(int64(port), 10)
for name, entryPoint := range p.EntryPoints {
if strings.HasSuffix(entryPoint.Address, ":"+portStr) {
// If the protocol is HTTP the entryPoint must have no TLS conf
// Not relevant for gatev1alpha2.TLSProtocolType && gatev1alpha2.TCPProtocolType
if protocol == gatev1alpha2.HTTPProtocolType && entryPoint.HasHTTPTLSConf {
// Not relevant for gatev1.TLSProtocolType && gatev1.TCPProtocolType
if protocol == gatev1.HTTPProtocolType && entryPoint.HasHTTPTLSConf {
continue
}
@ -609,43 +613,43 @@ func (p *Provider) entryPointName(port gatev1alpha2.PortNumber, protocol gatev1a
return "", fmt.Errorf("no matching entryPoint for port %d and protocol %q", port, protocol)
}
func supportedRouteKinds(protocol gatev1alpha2.ProtocolType) ([]gatev1alpha2.RouteGroupKind, []metav1.Condition) {
group := gatev1alpha2.Group(gatev1alpha2.GroupName)
func supportedRouteKinds(protocol gatev1.ProtocolType) ([]gatev1.RouteGroupKind, []metav1.Condition) {
group := gatev1.Group(gatev1.GroupName)
switch protocol {
case gatev1alpha2.TCPProtocolType:
return []gatev1alpha2.RouteGroupKind{{Kind: kindTCPRoute, Group: &group}}, nil
case gatev1.TCPProtocolType:
return []gatev1.RouteGroupKind{{Kind: kindTCPRoute, Group: &group}}, nil
case gatev1alpha2.HTTPProtocolType, gatev1alpha2.HTTPSProtocolType:
return []gatev1alpha2.RouteGroupKind{{Kind: kindHTTPRoute, Group: &group}}, nil
case gatev1.HTTPProtocolType, gatev1.HTTPSProtocolType:
return []gatev1.RouteGroupKind{{Kind: kindHTTPRoute, Group: &group}}, nil
case gatev1alpha2.TLSProtocolType:
return []gatev1alpha2.RouteGroupKind{
case gatev1.TLSProtocolType:
return []gatev1.RouteGroupKind{
{Kind: kindTCPRoute, Group: &group},
{Kind: kindTLSRoute, Group: &group},
}, nil
}
return nil, []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionDetached),
Status: metav1.ConditionTrue,
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionFalse,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonUnsupportedProtocol),
Reason: string(gatev1.ListenerReasonUnsupportedProtocol),
Message: fmt.Sprintf("Unsupported listener protocol %q", protocol),
}}
}
func getAllowedRouteKinds(listener gatev1alpha2.Listener, supportedKinds []gatev1alpha2.RouteGroupKind) ([]gatev1alpha2.RouteGroupKind, []metav1.Condition) {
func getAllowedRouteKinds(gateway *gatev1.Gateway, listener gatev1.Listener, supportedKinds []gatev1.RouteGroupKind) ([]gatev1.RouteGroupKind, []metav1.Condition) {
if listener.AllowedRoutes == nil || len(listener.AllowedRoutes.Kinds) == 0 {
return supportedKinds, nil
}
var (
routeKinds []gatev1alpha2.RouteGroupKind
routeKinds []gatev1.RouteGroupKind
conditions []metav1.Condition
)
uniqRouteKinds := map[gatev1alpha2.Kind]struct{}{}
uniqRouteKinds := map[gatev1.Kind]struct{}{}
for _, routeKind := range listener.AllowedRoutes.Kinds {
var isSupported bool
for _, kind := range supportedKinds {
@ -657,10 +661,11 @@ func getAllowedRouteKinds(listener gatev1alpha2.Listener, supportedKinds []gatev
if !isSupported {
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionDetached),
Type: string(gatev1.ListenerConditionAccepted),
Status: metav1.ConditionTrue,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonInvalidRouteKinds),
Reason: string(gatev1.ListenerReasonInvalidRouteKinds),
Message: fmt.Sprintf("Listener protocol %q does not support RouteGroupKind %v/%s", listener.Protocol, routeKind.Group, routeKind.Kind),
})
continue
@ -675,7 +680,7 @@ func getAllowedRouteKinds(listener gatev1alpha2.Listener, supportedKinds []gatev
return routeKinds, conditions
}
func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, listener gatev1alpha2.Listener, gateway *gatev1alpha2.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, listener gatev1.Listener, gateway *gatev1.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
if listener.AllowedRoutes == nil {
// Should not happen due to validation.
return nil
@ -685,8 +690,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouteNamespacesSelector", // Should never happen as the selector is validated by kubernetes
Message: fmt.Sprintf("Invalid route namespaces selector: %v", err),
@ -697,10 +703,11 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonRefNotPermitted),
Reason: string(gatev1.ListenerReasonRefNotPermitted),
Message: fmt.Sprintf("Cannot fetch HTTPRoutes: %v", err),
}}
}
@ -726,8 +733,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
hostRule, err := hostRule(hostnames)
if err != nil {
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouteHostname", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Skipping HTTPRoute %s: invalid hostname: %v", route.Name, err),
@ -740,8 +748,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "UnsupportedPathOrHeaderType", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Skipping HTTPRoute %s: cannot generate rule: %v", route.Name, err),
@ -753,7 +762,7 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
EntryPoints: []string{ep},
}
if listener.Protocol == gatev1alpha2.HTTPSProtocolType && listener.TLS != nil {
if listener.Protocol == gatev1.HTTPSProtocolType && listener.TLS != nil {
// TODO support let's encrypt
router.TLS = &dynamic.RouterTLSConfig{}
}
@ -764,8 +773,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouterKey", // Should never happen
Message: fmt.Sprintf("Skipping HTTPRoute %s: cannot make router's key with rule %s: %v", route.Name, router.Rule, err),
@ -779,8 +789,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "InvalidFilters" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidFilters", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Cannot load HTTPRoute filter %s/%s: %v", route.Namespace, route.Name, err),
@ -807,8 +818,9 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidBackendRefs", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Cannot load HTTPRoute service %s/%s: %v", route.Namespace, route.Name, err),
@ -839,7 +851,7 @@ func (p *Provider) gatewayHTTPRouteToHTTPConf(ctx context.Context, ep string, li
return conditions
}
func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alpha2.Listener, gateway *gatev1alpha2.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1.Listener, gateway *gatev1.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
if listener.AllowedRoutes == nil {
// Should not happen due to validation.
return nil
@ -849,8 +861,9 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouteNamespacesSelector", // TODO should never happen as the selector is validated by Kubernetes
Message: fmt.Sprintf("Invalid route namespaces selector: %v", err),
@ -861,10 +874,11 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonRefNotPermitted),
Reason: string(gatev1.ListenerReasonRefNotPermitted),
Message: fmt.Sprintf("Cannot fetch TCPRoutes: %v", err),
}}
}
@ -885,10 +899,10 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
EntryPoints: []string{ep},
}
if listener.Protocol == gatev1alpha2.TLSProtocolType && listener.TLS != nil {
if listener.Protocol == gatev1.TLSProtocolType && listener.TLS != nil {
// TODO support let's encrypt
router.TLS = &dynamic.RouterTCPTLSConfig{
Passthrough: listener.TLS.Mode != nil && *listener.TLS.Mode == gatev1alpha2.TLSModePassthrough,
Passthrough: listener.TLS.Mode != nil && *listener.TLS.Mode == gatev1.TLSModePassthrough,
}
}
@ -898,8 +912,9 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouterKey", // Should never happen
Message: fmt.Sprintf("Skipping TCPRoute %s: cannot make router's key with rule %s: %v", route.Name, router.Rule, err),
@ -923,8 +938,9 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidBackendRefs", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Cannot load TCPRoute service %s/%s: %v", route.Namespace, route.Name, err),
@ -969,7 +985,7 @@ func gatewayTCPRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
return conditions
}
func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alpha2.Listener, gateway *gatev1alpha2.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1.Listener, gateway *gatev1.Gateway, client Client, conf *dynamic.Configuration) []metav1.Condition {
if listener.AllowedRoutes == nil {
// Should not happen due to validation.
return nil
@ -979,8 +995,9 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouteNamespacesSelector", // TODO should never happen as the selector is validated by Kubernetes
Message: fmt.Sprintf("Invalid route namespaces selector: %v", err),
@ -991,10 +1008,11 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "InvalidRoutesRef" reason
return []metav1.Condition{{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: string(gatev1alpha2.ListenerReasonRefNotPermitted),
Reason: string(gatev1.ListenerReasonRefNotPermitted),
Message: fmt.Sprintf("Cannot fetch TLSRoutes: %v", err),
}}
}
@ -1014,9 +1032,10 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if len(hostnames) == 0 && listener.Hostname != nil && *listener.Hostname != "" && len(route.Spec.Hostnames) > 0 {
for _, parent := range route.Status.Parents {
parent.Conditions = append(parent.Conditions, metav1.Condition{
Type: string(gatev1alpha2.GatewayClassConditionStatusAccepted),
Type: string(gatev1.GatewayClassConditionStatusAccepted),
Status: metav1.ConditionFalse,
Reason: string(gatev1alpha2.ListenerReasonRouteConflict),
ObservedGeneration: gateway.Generation,
Reason: string(gatev1.ListenerConditionConflicted),
Message: fmt.Sprintf("No hostname match between listener: %v and route: %v", listener.Hostname, route.Spec.Hostnames),
LastTransitionTime: metav1.Now(),
})
@ -1029,8 +1048,9 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidHostnames", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Skipping TLSRoute %s: cannot make route's SNI match: %v", route.Name, err),
@ -1043,7 +1063,7 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
Rule: rule,
EntryPoints: []string{ep},
TLS: &dynamic.RouterTCPTLSConfig{
Passthrough: listener.TLS.Mode != nil && *listener.TLS.Mode == gatev1alpha2.TLSModePassthrough,
Passthrough: listener.TLS.Mode != nil && *listener.TLS.Mode == gatev1.TLSModePassthrough,
},
}
@ -1053,8 +1073,9 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidRouterKey", // Should never happen
Message: fmt.Sprintf("Skipping TLSRoute %s: cannot make router's key with rule %s: %v", route.Name, router.Rule, err),
@ -1078,8 +1099,9 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
if err != nil {
// update "ResolvedRefs" status true with "DroppedRoutes" reason
conditions = append(conditions, metav1.Condition{
Type: string(gatev1alpha2.ListenerConditionResolvedRefs),
Type: string(gatev1.ListenerConditionResolvedRefs),
Status: metav1.ConditionFalse,
ObservedGeneration: gateway.Generation,
LastTransitionTime: metav1.Now(),
Reason: "InvalidBackendRefs", // TODO check the spec if a proper reason is introduced at some point
Message: fmt.Sprintf("Cannot load TLSRoute service %s/%s: %v", route.Namespace, route.Name, err),
@ -1126,18 +1148,18 @@ func gatewayTLSRouteToTCPConf(ctx context.Context, ep string, listener gatev1alp
// Because of Kubernetes validation we admit that the given Hostnames are valid.
// https://github.com/kubernetes-sigs/gateway-api/blob/ff9883da4cad8554cd300394f725ab3a27502785/apis/v1alpha2/shared_types.go#L252
func matchingHostnames(listener gatev1alpha2.Listener, hostnames []gatev1alpha2.Hostname) []gatev1alpha2.Hostname {
func matchingHostnames(listener gatev1.Listener, hostnames []gatev1.Hostname) []gatev1.Hostname {
if listener.Hostname == nil || *listener.Hostname == "" {
return hostnames
}
if len(hostnames) == 0 {
return []gatev1alpha2.Hostname{*listener.Hostname}
return []gatev1.Hostname{*listener.Hostname}
}
listenerLabels := strings.Split(string(*listener.Hostname), ".")
var matches []gatev1alpha2.Hostname
var matches []gatev1.Hostname
for _, hostname := range hostnames {
if hostname == *listener.Hostname {
@ -1168,9 +1190,9 @@ func matchingHostnames(listener gatev1alpha2.Listener, hostnames []gatev1alpha2.
return matches
}
func shouldAttach(gateway *gatev1alpha2.Gateway, listener gatev1alpha2.Listener, routeNamespace string, routeSpec gatev1alpha2.CommonRouteSpec) bool {
func shouldAttach(gateway *gatev1.Gateway, listener gatev1.Listener, routeNamespace string, routeSpec gatev1.CommonRouteSpec) bool {
for _, parentRef := range routeSpec.ParentRefs {
if parentRef.Group == nil || *parentRef.Group != gatev1alpha2.GroupName {
if parentRef.Group == nil || *parentRef.Group != gatev1.GroupName {
continue
}
@ -1195,19 +1217,19 @@ func shouldAttach(gateway *gatev1alpha2.Gateway, listener gatev1alpha2.Listener,
return false
}
func getRouteBindingSelectorNamespace(client Client, gatewayNamespace string, routeNamespaces *gatev1alpha2.RouteNamespaces) ([]string, error) {
func getRouteBindingSelectorNamespace(client Client, gatewayNamespace string, routeNamespaces *gatev1.RouteNamespaces) ([]string, error) {
if routeNamespaces == nil || routeNamespaces.From == nil {
return []string{gatewayNamespace}, nil
}
switch *routeNamespaces.From {
case gatev1alpha2.NamespacesFromAll:
case gatev1.NamespacesFromAll:
return []string{metav1.NamespaceAll}, nil
case gatev1alpha2.NamespacesFromSame:
case gatev1.NamespacesFromSame:
return []string{gatewayNamespace}, nil
case gatev1alpha2.NamespacesFromSelector:
case gatev1.NamespacesFromSelector:
selector, err := metav1.LabelSelectorAsSelector(routeNamespaces.Selector)
if err != nil {
return nil, fmt.Errorf("malformed selector: %w", err)
@ -1219,7 +1241,7 @@ func getRouteBindingSelectorNamespace(client Client, gatewayNamespace string, ro
return nil, fmt.Errorf("unsupported RouteSelectType: %q", *routeNamespaces.From)
}
func hostRule(hostnames []gatev1alpha2.Hostname) (string, error) {
func hostRule(hostnames []gatev1.Hostname) (string, error) {
var rules []string
for _, hostname := range hostnames {
@ -1256,9 +1278,9 @@ func hostRule(hostnames []gatev1alpha2.Hostname) (string, error) {
}
}
func hostSNIRule(hostnames []gatev1alpha2.Hostname) (string, error) {
func hostSNIRule(hostnames []gatev1.Hostname) (string, error) {
rules := make([]string, 0, len(hostnames))
uniqHostnames := map[gatev1alpha2.Hostname]struct{}{}
uniqHostnames := map[gatev1.Hostname]struct{}{}
for _, hostname := range hostnames {
if len(hostname) == 0 {
@ -1293,7 +1315,7 @@ func hostSNIRule(hostnames []gatev1alpha2.Hostname) (string, error) {
return strings.Join(rules, " || "), nil
}
func extractRule(routeRule gatev1alpha2.HTTPRouteRule, hostRule string) (string, error) {
func extractRule(routeRule gatev1.HTTPRouteRule, hostRule string) (string, error) {
var rule string
var matchesRules []string
@ -1307,9 +1329,9 @@ func extractRule(routeRule gatev1alpha2.HTTPRouteRule, hostRule string) (string,
if match.Path != nil && match.Path.Type != nil && match.Path.Value != nil {
// TODO handle other path types
switch *match.Path.Type {
case gatev1alpha2.PathMatchExact:
case gatev1.PathMatchExact:
matchRules = append(matchRules, fmt.Sprintf("Path(`%s`)", *match.Path.Value))
case gatev1alpha2.PathMatchPathPrefix:
case gatev1.PathMatchPathPrefix:
matchRules = append(matchRules, fmt.Sprintf("PathPrefix(`%s`)", *match.Path.Value))
default:
return "", fmt.Errorf("unsupported path match %s", *match.Path.Type)
@ -1350,7 +1372,7 @@ func extractRule(routeRule gatev1alpha2.HTTPRouteRule, hostRule string) (string,
return rule + "(" + strings.Join(matchesRules, " || ") + ")", nil
}
func extractHeaderRules(headers []gatev1alpha2.HTTPHeaderMatch) ([]string, error) {
func extractHeaderRules(headers []gatev1.HTTPHeaderMatch) ([]string, error) {
var headerRules []string
// TODO handle other headers types
@ -1361,7 +1383,7 @@ func extractHeaderRules(headers []gatev1alpha2.HTTPHeaderMatch) ([]string, error
}
switch *header.Type {
case gatev1alpha2.HeaderMatchExact:
case gatev1.HeaderMatchExact:
headerRules = append(headerRules, fmt.Sprintf("Headers(`%s`,`%s`)", header.Name, header.Value))
default:
return nil, fmt.Errorf("unsupported header match type %s", *header.Type)
@ -1390,7 +1412,7 @@ func makeID(namespace, name string) string {
return namespace + "-" + name
}
func getTLS(k8sClient Client, secretName gatev1alpha2.ObjectName, namespace string) (*tls.CertAndStores, error) {
func getTLS(k8sClient Client, secretName gatev1.ObjectName, namespace string) (*tls.CertAndStores, error) {
secret, exists, err := k8sClient.GetSecret(namespace, string(secretName))
if err != nil {
return nil, fmt.Errorf("failed to fetch secret %s/%s: %w", namespace, secretName, err)
@ -1464,7 +1486,7 @@ func getCertificateBlocks(secret *corev1.Secret, namespace, secretName string) (
}
// loadServices is generating a WRR service, even when there is only one target.
func loadServices(client Client, namespace string, backendRefs []gatev1alpha2.HTTPBackendRef) (*dynamic.Service, map[string]*dynamic.Service, error) {
func loadServices(client Client, namespace string, backendRefs []gatev1.HTTPBackendRef) (*dynamic.Service, map[string]*dynamic.Service, error) {
services := map[string]*dynamic.Service{}
wrrSvc := &dynamic.Service{
@ -1483,7 +1505,7 @@ func loadServices(client Client, namespace string, backendRefs []gatev1alpha2.HT
return nil, nil, fmt.Errorf("traefik internal service %s is not allowed in a WRR loadbalancer", backendRef.BackendRef.Name)
}
weight := int(pointer.Int32Deref(backendRef.Weight, 1))
weight := int(ptr.Deref(backendRef.Weight, 1))
if isTraefikService(backendRef.BackendRef) {
wrrSvc.Weighted.Services = append(wrrSvc.Weighted.Services, dynamic.WRRService{Name: string(backendRef.Name), Weight: &weight})
@ -1587,7 +1609,7 @@ func loadServices(client Client, namespace string, backendRefs []gatev1alpha2.HT
}
// loadTCPServices is generating a WRR service, even when there is only one target.
func loadTCPServices(client Client, namespace string, backendRefs []gatev1alpha2.BackendRef) (*dynamic.TCPService, map[string]*dynamic.TCPService, error) {
func loadTCPServices(client Client, namespace string, backendRefs []gatev1.BackendRef) (*dynamic.TCPService, map[string]*dynamic.TCPService, error) {
services := map[string]*dynamic.TCPService{}
wrrSvc := &dynamic.TCPService{
@ -1606,7 +1628,7 @@ func loadTCPServices(client Client, namespace string, backendRefs []gatev1alpha2
return nil, nil, fmt.Errorf("traefik internal service %s is not allowed in a WRR loadbalancer", backendRef.Name)
}
weight := int(pointer.Int32Deref(backendRef.Weight, 1))
weight := int(ptr.Deref(backendRef.Weight, 1))
if isTraefikService(backendRef) {
wrrSvc.Weighted.Services = append(wrrSvc.Weighted.Services, dynamic.TCPWRRService{Name: string(backendRef.Name), Weight: &weight})
@ -1705,16 +1727,16 @@ func loadTCPServices(client Client, namespace string, backendRefs []gatev1alpha2
return wrrSvc, services, nil
}
func loadMiddlewares(listener gatev1alpha2.Listener, prefix string, filters []gatev1alpha2.HTTPRouteFilter) (map[string]*dynamic.Middleware, error) {
func loadMiddlewares(listener gatev1.Listener, prefix string, filters []gatev1.HTTPRouteFilter) (map[string]*dynamic.Middleware, error) {
middlewares := make(map[string]*dynamic.Middleware)
// The spec allows for an empty string in which case we should use the
// scheme of the request which in this case is the listener scheme.
var listenerScheme string
switch listener.Protocol {
case gatev1alpha2.HTTPProtocolType:
case gatev1.HTTPProtocolType:
listenerScheme = "http"
case gatev1alpha2.HTTPSProtocolType:
case gatev1.HTTPSProtocolType:
listenerScheme = "https"
default:
return nil, fmt.Errorf("invalid listener protocol %s", listener.Protocol)
@ -1723,7 +1745,7 @@ func loadMiddlewares(listener gatev1alpha2.Listener, prefix string, filters []ga
for i, filter := range filters {
var middleware *dynamic.Middleware
switch filter.Type {
case gatev1alpha2.HTTPRouteFilterRequestRedirect:
case gatev1.HTTPRouteFilterRequestRedirect:
var err error
middleware, err = createRedirectRegexMiddleware(listenerScheme, filter.RequestRedirect)
if err != nil {
@ -1745,7 +1767,7 @@ func loadMiddlewares(listener gatev1alpha2.Listener, prefix string, filters []ga
return middlewares, nil
}
func createRedirectRegexMiddleware(scheme string, filter *gatev1alpha2.HTTPRequestRedirectFilter) (*dynamic.Middleware, error) {
func createRedirectRegexMiddleware(scheme string, filter *gatev1.HTTPRequestRedirectFilter) (*dynamic.Middleware, error) {
// Use the HTTPRequestRedirectFilter scheme if defined.
filterScheme := scheme
if filter.Scheme != nil {
@ -1823,7 +1845,7 @@ func throttleEvents(ctx context.Context, throttleDuration time.Duration, pool *s
return eventsChanBuffered
}
func isTraefikService(ref gatev1alpha2.BackendRef) bool {
func isTraefikService(ref gatev1.BackendRef) bool {
if ref.Kind == nil || ref.Group == nil {
return false
}
@ -1831,13 +1853,13 @@ func isTraefikService(ref gatev1alpha2.BackendRef) bool {
return *ref.Group == traefikv1alpha1.GroupName && *ref.Kind == kindTraefikService
}
func isInternalService(ref gatev1alpha2.BackendRef) bool {
func isInternalService(ref gatev1.BackendRef) bool {
return isTraefikService(ref) && strings.HasSuffix(string(ref.Name), "@internal")
}
// makeListenerKey joins protocol, hostname, and port of a listener into a string key.
func makeListenerKey(l gatev1alpha2.Listener) string {
var hostname gatev1alpha2.Hostname
func makeListenerKey(l gatev1.Listener) string {
var hostname gatev1.Hostname
if l.Hostname != nil {
hostname = *l.Hostname
}

514
pkg/provider/kubernetes/gateway/kubernetes_test.go
View file

File diff suppressed because it is too large Load diff

2
pkg/provider/kubernetes/k8s/event_handler.go
View file

@ -11,7 +11,7 @@ type ResourceEventHandler struct {
}
// OnAdd is called on Add Events.
func (reh *ResourceEventHandler) OnAdd(obj interface{}) {
func (reh *ResourceEventHandler) OnAdd(obj interface{}, isInInitialList bool) {
eventHandlerFunc(reh.Ev, obj)
}