From 95685562af3449b3752b57c6d5fb32fd9e02bed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Wed, 7 Sep 2022 11:37:14 +0200 Subject: [PATCH] chore: address missed HTTPRoute v1alpha2 references --- .../parser/translate_httproute_test.go | 18 +++++++++--------- internal/store/store.go | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/dataplane/parser/translate_httproute_test.go b/internal/dataplane/parser/translate_httproute_test.go index b475b9558a..41d81a5597 100644 --- a/internal/dataplane/parser/translate_httproute_test.go +++ b/internal/dataplane/parser/translate_httproute_test.go @@ -23,7 +23,7 @@ import ( // Kubernetes API. var httprouteGVK = schema.GroupVersionKind{ Group: "gateway.networking.k8s.io", - Version: "v1alpha2", + Version: "v1beta1", Kind: "HTTPRoute", } @@ -120,7 +120,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { Annotations: make(map[string]string), GroupVersionKind: schema.GroupVersionKind{ Group: "gateway.networking.k8s.io", - Version: "v1alpha2", + Version: "v1beta1", Kind: "HTTPRoute", }, }, @@ -160,7 +160,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { }, TypeMeta: metav1.TypeMeta{ Kind: "HTTPRoute", - APIVersion: "gateway.networking.k8s.io/v1alpha2", + APIVersion: "gateway.networking.k8s.io/v1beta1", }, }, }, @@ -274,7 +274,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { Annotations: make(map[string]string), GroupVersionKind: schema.GroupVersionKind{ Group: "gateway.networking.k8s.io", - Version: "v1alpha2", + Version: "v1beta1", Kind: "HTTPRoute", }, }, @@ -318,7 +318,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { }, TypeMeta: metav1.TypeMeta{ Kind: "HTTPRoute", - APIVersion: "gateway.networking.k8s.io/v1alpha2", + APIVersion: "gateway.networking.k8s.io/v1beta1", }, }, }, @@ -461,7 +461,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { Annotations: make(map[string]string), GroupVersionKind: schema.GroupVersionKind{ Group: "gateway.networking.k8s.io", - Version: "v1alpha2", + Version: "v1beta1", Kind: "HTTPRoute", }, }, @@ -505,7 +505,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { }, TypeMeta: metav1.TypeMeta{ Kind: "HTTPRoute", - APIVersion: "gateway.networking.k8s.io/v1alpha2", + APIVersion: "gateway.networking.k8s.io/v1beta1", }, }, }, @@ -584,7 +584,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { Annotations: make(map[string]string), GroupVersionKind: schema.GroupVersionKind{ Group: "gateway.networking.k8s.io", - Version: "v1alpha2", + Version: "v1beta1", Kind: "HTTPRoute", }, }, @@ -628,7 +628,7 @@ func Test_ingressRulesFromHTTPRoutes(t *testing.T) { }, TypeMeta: metav1.TypeMeta{ Kind: "HTTPRoute", - APIVersion: "gateway.networking.k8s.io/v1alpha2", + APIVersion: "gateway.networking.k8s.io/v1beta1", }, }, }, diff --git a/internal/store/store.go b/internal/store/store.go index fe65d17cee..ccdfc60967 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -1048,7 +1048,7 @@ func mkObjFromGVK(gvk schema.GroupVersionKind) (runtime.Object, error) { // ---------------------------------------------------------------------------- // Kubernetes Gateway APIs // ---------------------------------------------------------------------------- - case gatewayv1alpha2.SchemeGroupVersion.WithKind("HTTPRoutes"): + case gatewayv1beta1.SchemeGroupVersion.WithKind("HTTPRoutes"): return &gatewayv1beta1.HTTPRoute{}, nil // ---------------------------------------------------------------------------- // Kong APIs