From 82a3b6a3d4bc5c1544d9ab5251291173f05defb0 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Wed, 18 Oct 2023 20:13:13 -0700 Subject: [PATCH] v1b1 everywhere for ref grant Signed-off-by: Arko Dasgupta --- internal/gatewayapi/resource.go | 5 +++-- internal/gatewayapi/translator_test.go | 14 +++++++------- internal/gatewayapi/validate.go | 3 ++- internal/gatewayapi/zz_generated.deepcopy.go | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/internal/gatewayapi/resource.go b/internal/gatewayapi/resource.go index cf9810b2d70..6379590686d 100644 --- a/internal/gatewayapi/resource.go +++ b/internal/gatewayapi/resource.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" mcsapi "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" @@ -33,7 +34,7 @@ type Resources struct { TLSRoutes []*gwapiv1a2.TLSRoute `json:"tlsRoutes,omitempty" yaml:"tlsRoutes,omitempty"` TCPRoutes []*gwapiv1a2.TCPRoute `json:"tcpRoutes,omitempty" yaml:"tcpRoutes,omitempty"` UDPRoutes []*gwapiv1a2.UDPRoute `json:"udpRoutes,omitempty" yaml:"udpRoutes,omitempty"` - ReferenceGrants []*gwapiv1a2.ReferenceGrant `json:"referenceGrants,omitempty" yaml:"referenceGrants,omitempty"` + ReferenceGrants []*gwapiv1b1.ReferenceGrant `json:"referenceGrants,omitempty" yaml:"referenceGrants,omitempty"` Namespaces []*v1.Namespace `json:"namespaces,omitempty" yaml:"namespaces,omitempty"` Services []*v1.Service `json:"services,omitempty" yaml:"services,omitempty"` ServiceImports []*mcsapi.ServiceImport `json:"serviceImports,omitempty" yaml:"serviceImports,omitempty"` @@ -56,7 +57,7 @@ func NewResources() *Resources { Services: []*v1.Service{}, EndpointSlices: []*discoveryv1.EndpointSlice{}, Secrets: []*v1.Secret{}, - ReferenceGrants: []*gwapiv1a2.ReferenceGrant{}, + ReferenceGrants: []*gwapiv1b1.ReferenceGrant{}, Namespaces: []*v1.Namespace{}, RateLimitFilters: []*egv1a1.RateLimitFilter{}, AuthenticationFilters: []*egv1a1.AuthenticationFilter{}, diff --git a/internal/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go index 3449873cee2..ed30fb53142 100644 --- a/internal/gatewayapi/translator_test.go +++ b/internal/gatewayapi/translator_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/intstr" - "sigs.k8s.io/gateway-api/apis/v1alpha2" + "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/yaml" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" @@ -537,7 +537,7 @@ func TestIsValidCrossNamespaceRef(t *testing.T) { name string from crossNamespaceFrom to crossNamespaceTo - referenceGrant *v1alpha2.ReferenceGrant + referenceGrant *v1beta1.ReferenceGrant want bool } @@ -559,20 +559,20 @@ func TestIsValidCrossNamespaceRef(t *testing.T) { namespace: "default", name: "tls-secret-1", }, - referenceGrant: &v1alpha2.ReferenceGrant{ + referenceGrant: &v1beta1.ReferenceGrant{ ObjectMeta: metav1.ObjectMeta{ Name: "referencegrant-1", Namespace: "default", }, - Spec: v1alpha2.ReferenceGrantSpec{ - From: []v1alpha2.ReferenceGrantFrom{ + Spec: v1beta1.ReferenceGrantSpec{ + From: []v1beta1.ReferenceGrantFrom{ { Group: "gateway.networking.k8s.io", Kind: "Gateway", Namespace: "envoy-gateway-system", }, }, - To: []v1alpha2.ReferenceGrantTo{ + To: []v1beta1.ReferenceGrantTo{ { Group: "", Kind: "Secret", @@ -642,7 +642,7 @@ func TestIsValidCrossNamespaceRef(t *testing.T) { for _, tc := range testcases { tc := tc t.Run(tc.name, func(t *testing.T) { - var referenceGrants []*v1alpha2.ReferenceGrant + var referenceGrants []*v1beta1.ReferenceGrant if tc.referenceGrant != nil { referenceGrants = append(referenceGrants, tc.referenceGrant) } diff --git a/internal/gatewayapi/validate.go b/internal/gatewayapi/validate.go index d835dea1518..a6d18487e76 100644 --- a/internal/gatewayapi/validate.go +++ b/internal/gatewayapi/validate.go @@ -16,6 +16,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func (t *Translator) validateBackendRef(backendRef *gwapiv1a2.BackendRef, parentRef *RouteParentContext, route RouteContext, @@ -629,7 +630,7 @@ func (t *Translator) validateConflictedLayer4Listeners(gateways []*GatewayContex } } -func (t *Translator) validateCrossNamespaceRef(from crossNamespaceFrom, to crossNamespaceTo, referenceGrants []*gwapiv1a2.ReferenceGrant) bool { +func (t *Translator) validateCrossNamespaceRef(from crossNamespaceFrom, to crossNamespaceTo, referenceGrants []*gwapiv1b1.ReferenceGrant) bool { for _, referenceGrant := range referenceGrants { // The ReferenceGrant must be defined in the namespace of // the "to" (the referent). diff --git a/internal/gatewayapi/zz_generated.deepcopy.go b/internal/gatewayapi/zz_generated.deepcopy.go index b69bd8fdffb..5fa57b08656 100644 --- a/internal/gatewayapi/zz_generated.deepcopy.go +++ b/internal/gatewayapi/zz_generated.deepcopy.go @@ -16,6 +16,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" + "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" ) @@ -95,11 +96,11 @@ func (in *Resources) DeepCopyInto(out *Resources) { } if in.ReferenceGrants != nil { in, out := &in.ReferenceGrants, &out.ReferenceGrants - *out = make([]*v1alpha2.ReferenceGrant, len(*in)) + *out = make([]*v1beta1.ReferenceGrant, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(v1alpha2.ReferenceGrant) + *out = new(v1beta1.ReferenceGrant) (*in).DeepCopyInto(*out) } }