diff --git a/api/v1alpha1/basic_auth_types.go b/api/v1alpha1/basic_auth_types.go index 97fa66d5e769..325a0227092f 100644 --- a/api/v1alpha1/basic_auth_types.go +++ b/api/v1alpha1/basic_auth_types.go @@ -5,7 +5,7 @@ package v1alpha1 -import gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" +import gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" const BasicAuthUsersSecretKey = ".htpasswd" @@ -23,5 +23,5 @@ type BasicAuth struct { // for more details. // // Note: The secret must be in the same namespace as the SecurityPolicy. - Users gwapiv1b1.SecretObjectReference `json:"users"` + Users gwapiv1.SecretObjectReference `json:"users"` } diff --git a/api/v1alpha1/oidc_types.go b/api/v1alpha1/oidc_types.go index 391ea71425b0..4741f0ca8a2e 100644 --- a/api/v1alpha1/oidc_types.go +++ b/api/v1alpha1/oidc_types.go @@ -5,9 +5,7 @@ package v1alpha1 -import ( - gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" -) +import gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" const OIDCClientSecretKey = "client-secret" @@ -28,7 +26,7 @@ type OIDC struct { // This is an Opaque secret. The client secret should be stored in the key // "client-secret". // +kubebuilder:validation:Required - ClientSecret gwapiv1b1.SecretObjectReference `json:"clientSecret"` + ClientSecret gwapiv1.SecretObjectReference `json:"clientSecret"` // The OIDC scopes to be used in the // [Authentication Request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest). diff --git a/internal/cmd/egctl/status.go b/internal/cmd/egctl/status.go index 3a23b36afe41..918f50e53990 100644 --- a/internal/cmd/egctl/status.go +++ b/internal/cmd/egctl/status.go @@ -18,8 +18,8 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" ) @@ -119,21 +119,21 @@ func runStatus(ctx context.Context, cli client.Client, resourceType, namespace s switch strings.ToLower(resourceType) { case "gc", "gatewayclass": - gc := gwv1.GatewayClassList{} + gc := gwv1b1.GatewayClassList{} if err := cli.List(ctx, &gc, client.InNamespace(namespace)); err != nil { return err } resourcesList = &gc case "gtw", "gateway": - gtw := gwv1.GatewayList{} + gtw := gwv1b1.GatewayList{} if err := cli.List(ctx, >w, client.InNamespace(namespace)); err != nil { return err } resourcesList = >w case "httproute": - httproute := gwv1.HTTPRouteList{} + httproute := gwv1b1.HTTPRouteList{} if err := cli.List(ctx, &httproute, client.InNamespace(namespace)); err != nil { return err } diff --git a/internal/cmd/egctl/status_test.go b/internal/cmd/egctl/status_test.go index ad1fd80b8bc9..47fe42a3d6cd 100644 --- a/internal/cmd/egctl/status_test.go +++ b/internal/cmd/egctl/status_test.go @@ -10,13 +10,14 @@ import ( "testing" "time" + egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" + "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - - egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" + gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func TestWriteStatus(t *testing.T) { @@ -37,7 +38,7 @@ func TestWriteStatus(t *testing.T) { }{ { name: "egctl x status gc -v, but no resources", - resourceList: &gwv1.GatewayClassList{}, + resourceList: &gwv1b1.GatewayClassList{}, resourceNamespaced: false, resourceType: "gatewayclass", quiet: false, @@ -50,8 +51,8 @@ func TestWriteStatus(t *testing.T) { }, { name: "egctl x status gc", - resourceList: &gwv1.GatewayClassList{ - Items: []gwv1.GatewayClass{ + resourceList: &gwv1b1.GatewayClassList{ + Items: []gwv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc", @@ -93,8 +94,8 @@ gc foobar2 test-status-2 test reason 2 }, { name: "egctl x status gc -v", - resourceList: &gwv1.GatewayClassList{ - Items: []gwv1.GatewayClass{ + resourceList: &gwv1b1.GatewayClassList{ + Items: []gwv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc", @@ -136,8 +137,8 @@ gc foobar2 test-status-2 test reason 2 test message 2 123457 }, { name: "egctl x status gc -v -q", - resourceList: &gwv1.GatewayClassList{ - Items: []gwv1.GatewayClass{ + resourceList: &gwv1b1.GatewayClassList{ + Items: []gwv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc", @@ -178,7 +179,7 @@ gc foobar2 test-status-2 test reason 2 test message 2 123457 }, { name: "egctl x status gtw -v -A, no resources", - resourceList: &gwv1.GatewayList{}, + resourceList: &gwv1b1.GatewayList{}, resourceNamespaced: true, resourceType: "gateway", quiet: false, @@ -191,8 +192,8 @@ gc foobar2 test-status-2 test reason 2 test message 2 123457 }, { name: "egctl x status gtw -v -A", - resourceList: &gwv1.GatewayList{ - Items: []gwv1.Gateway{ + resourceList: &gwv1b1.GatewayList{ + Items: []gwv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Name: "gtw", @@ -235,8 +236,8 @@ default gtw foobar2 test-status-2 test reason 2 test message 2 }, { name: "egctl x status gtw -v -q -A", - resourceList: &gwv1.GatewayList{ - Items: []gwv1.Gateway{ + resourceList: &gwv1b1.GatewayList{ + Items: []gwv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Name: "gtw1", @@ -305,8 +306,8 @@ default2 gtw2 foobar4 test-status-4 test reason 4 test message 4 }, { name: "egctl x status httproute -A", - resourceList: &gwv1.HTTPRouteList{ - Items: []gwv1.HTTPRoute{ + resourceList: &gwv1b1.HTTPRouteList{ + Items: []gwv1b1.HTTPRoute{ { ObjectMeta: metav1.ObjectMeta{ Name: "http1", @@ -389,8 +390,8 @@ default2 http2 foobar4 test-status-4 test reason 4 }, { name: "egctl x status httproute -q -n default1", - resourceList: &gwv1.HTTPRouteList{ - Items: []gwv1.HTTPRoute{ + resourceList: &gwv1b1.HTTPRouteList{ + Items: []gwv1b1.HTTPRoute{ { ObjectMeta: metav1.ObjectMeta{ Name: "http1", diff --git a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml index 1cdb52f993a8..4eb7e3711c39 100644 --- a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml +++ b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -91,7 +91,7 @@ spec: port: 3000 weight: 1 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml b/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml index 57e3253c71a4..08f29a8e5c23 100644 --- a/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml +++ b/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -70,7 +70,7 @@ spec: fieldRef: fieldPath: metadata.namespace --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml b/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml index be98f705f713..2afa672e57c4 100644 --- a/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -74,7 +74,7 @@ spec: fieldRef: fieldPath: metadata.namespace --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml index b13096a2e3a9..348cf15c998f 100644 --- a/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml +++ b/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -123,7 +123,7 @@ spec: port: 3000 weight: 1 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml index 9e31a94aa6ab..e180c5be2259 100644 --- a/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml @@ -18,7 +18,7 @@ spec: address: 127.0.0.1 port_value: 19000 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg @@ -30,7 +30,7 @@ spec: name: example namespace: default --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -148,7 +148,7 @@ spec: port: 3000 weight: 1 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml index cef3ccc53833..04561e91f8cb 100644 --- a/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml +++ b/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -85,7 +85,7 @@ spec: remoteJWKS: uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/jwt/jwks.json --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml b/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml index 4f6b54facebf..8a332388c9c1 100644 --- a/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml +++ b/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -41,7 +41,7 @@ spec: selector: app: backend --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend @@ -63,7 +63,7 @@ spec: type: PathPrefix value: / --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg2 @@ -75,7 +75,7 @@ spec: protocol: HTTP port: 80 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml b/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml index 529fae44af26..25f2e5fe2922 100644 --- a/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml +++ b/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -9,7 +9,7 @@ spec: protocol: HTTP port: 80 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/quickstart.yaml b/internal/cmd/egctl/testdata/translate/in/quickstart.yaml index 57e3253c71a4..08f29a8e5c23 100644 --- a/internal/cmd/egctl/testdata/translate/in/quickstart.yaml +++ b/internal/cmd/egctl/testdata/translate/in/quickstart.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -70,7 +70,7 @@ spec: fieldRef: fieldPath: metadata.namespace --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/rejected-http-route.yaml b/internal/cmd/egctl/testdata/translate/in/rejected-http-route.yaml index 6979c77c15ef..ea4f4e98a3f5 100644 --- a/internal/cmd/egctl/testdata/translate/in/rejected-http-route.yaml +++ b/internal/cmd/egctl/testdata/translate/in/rejected-http-route.yaml @@ -1,11 +1,11 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -16,7 +16,7 @@ spec: protocol: TLS port: 8443 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml index bb9ca9478f96..dd8454a2e9b0 100644 --- a/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml @@ -11,7 +11,7 @@ spec: annotations: custom1: svc-annotation1 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass metadata: name: eg @@ -23,7 +23,7 @@ spec: name: example namespace: default --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: eg @@ -141,7 +141,7 @@ spec: port: 3000 weight: 1 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: backend diff --git a/internal/cmd/egctl/translate.go b/internal/cmd/egctl/translate.go index 7935950bcbce..f85af11ce327 100644 --- a/internal/cmd/egctl/translate.go +++ b/internal/cmd/egctl/translate.go @@ -19,6 +19,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/known/anypb" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/yaml" adminv3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" @@ -551,6 +552,13 @@ func addMissingServices(requiredServices map[string]*v1.Service, obj interface{} refs = append(refs, httpBakcendRef.BackendRef) } } + case *gwapiv1b1.HTTPRoute: + objNamespace = route.Namespace + for _, rule := range route.Spec.Rules { + for _, httpBakcendRef := range rule.BackendRefs { + refs = append(refs, httpBakcendRef.BackendRef) + } + } case *gwapiv1a2.GRPCRoute: objNamespace = route.Namespace for _, rule := range route.Spec.Rules { @@ -681,7 +689,7 @@ func kubernetesYAMLToResources(str string, addMissingResources bool) (*gatewayap resources.EnvoyProxy = envoyProxy case gatewayapi.KindGatewayClass: typedSpec := spec.Interface() - gatewayClass := &gwapiv1.GatewayClass{ + gatewayClass := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, @@ -691,7 +699,7 @@ func kubernetesYAMLToResources(str string, addMissingResources bool) (*gatewayap resources.GatewayClass = gatewayClass case gatewayapi.KindGateway: typedSpec := spec.Interface() - gateway := &gwapiv1.Gateway{ + gateway := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, @@ -740,7 +748,7 @@ func kubernetesYAMLToResources(str string, addMissingResources bool) (*gatewayap resources.TLSRoutes = append(resources.TLSRoutes, tlsRoute) case gatewayapi.KindHTTPRoute: typedSpec := spec.Interface() - httpRoute := &gwapiv1.HTTPRoute{ + httpRoute := &gwapiv1b1.HTTPRoute{ TypeMeta: metav1.TypeMeta{ Kind: gatewayapi.KindHTTPRoute, }, diff --git a/internal/gatewayapi/backendtrafficpolicy.go b/internal/gatewayapi/backendtrafficpolicy.go index 352e6adf9d2d..7859c33b9cc0 100644 --- a/internal/gatewayapi/backendtrafficpolicy.go +++ b/internal/gatewayapi/backendtrafficpolicy.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/ptr" + gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -201,7 +201,7 @@ func resolveBTPolicyGatewayTargetRef(policy *egv1a1.BackendTrafficPolicy, gatewa targetNs := policy.Spec.TargetRef.Namespace // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Check if the gateway exists @@ -248,7 +248,7 @@ func resolveBTPolicyRouteTargetRef(policy *egv1a1.BackendTrafficPolicy, routes m targetNs := policy.Spec.TargetRef.Namespace // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Check if the route exists diff --git a/internal/gatewayapi/clienttrafficpolicy.go b/internal/gatewayapi/clienttrafficpolicy.go index ef8869f5bc83..2ca6e7445342 100644 --- a/internal/gatewayapi/clienttrafficpolicy.go +++ b/internal/gatewayapi/clienttrafficpolicy.go @@ -16,7 +16,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/ptr" - gwv1b1 "sigs.k8s.io/gateway-api/apis/v1" + gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" @@ -263,7 +263,7 @@ func resolveCTPolicyTargetRef(policy *egv1a1.ClientTrafficPolicy, gateways map[t targetNs := policy.Spec.TargetRef.Namespace // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Check if the gateway exists diff --git a/internal/gatewayapi/contexts.go b/internal/gatewayapi/contexts.go index 1ee327302b18..67e545e1edf8 100644 --- a/internal/gatewayapi/contexts.go +++ b/internal/gatewayapi/contexts.go @@ -15,12 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // GatewayContext wraps a Gateway and provides helper methods for // setting conditions, accessing Listeners, etc. type GatewayContext struct { - *gwapiv1.Gateway + *gwapiv1b1.Gateway listeners []*ListenerContext } @@ -48,7 +49,7 @@ func (g *GatewayContext) ResetListeners() { type ListenerContext struct { *gwapiv1.Listener - gateway *gwapiv1.Gateway + gateway *gwapiv1b1.Gateway listenerStatusIdx int namespaceSelector labels.Selector tlsSecrets []*v1.Secret @@ -162,7 +163,7 @@ type HTTPRouteContext struct { // GatewayControllerName is the name of the Gateway API controller. GatewayControllerName string - *gwapiv1.HTTPRoute + *gwapiv1b1.HTTPRoute ParentRefs map[gwapiv1.ParentReference]*RouteParentContext } @@ -354,7 +355,7 @@ type RouteParentContext struct { // TODO: [v1alpha2-gwapiv1] This can probably be replaced with // a single field pointing to *gwapiv1.RouteStatus. - HTTPRoute *gwapiv1.HTTPRoute + HTTPRoute *gwapiv1b1.HTTPRoute GRPCRoute *v1alpha2.GRPCRoute TLSRoute *v1alpha2.TLSRoute TCPRoute *v1alpha2.TCPRoute diff --git a/internal/gatewayapi/contexts_test.go b/internal/gatewayapi/contexts_test.go index 5c016f8b40bc..4f78a3bbc96f 100644 --- a/internal/gatewayapi/contexts_test.go +++ b/internal/gatewayapi/contexts_test.go @@ -11,10 +11,11 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func TestContexts(t *testing.T) { - gateway := &gwapiv1.Gateway{ + gateway := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "envoy-gateway", Name: "gateway-1", @@ -47,7 +48,7 @@ func TestContexts(t *testing.T) { require.EqualValues(t, gwapiv1.ListenerReasonUnsupportedProtocol, gateway.Status.Listeners[0].Conditions[0].Reason) require.EqualValues(t, "HTTPS protocol is not supported yet", gateway.Status.Listeners[0].Conditions[0].Message) - lctx.SetSupportedKinds(gwapiv1.RouteGroupKind{Group: GroupPtr(gwapiv1.GroupName), Kind: "HTTPRoute"}) + lctx.SetSupportedKinds(gwapiv1.RouteGroupKind{Group: GroupPtr(gwapiv1b1.GroupName), Kind: "HTTPRoute"}) require.Len(t, gateway.Status.Listeners, 1) require.Len(t, gateway.Status.Listeners[0].SupportedKinds, 1) @@ -58,7 +59,7 @@ func TestContexts(t *testing.T) { } func TestContextsStaleListener(t *testing.T) { - gateway := &gwapiv1.Gateway{ + gateway := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "envoy-gateway", Name: "gateway-1", diff --git a/internal/gatewayapi/envoypatchpolicy.go b/internal/gatewayapi/envoypatchpolicy.go index 1ec835e51a4b..673f6cb443f8 100644 --- a/internal/gatewayapi/envoypatchpolicy.go +++ b/internal/gatewayapi/envoypatchpolicy.go @@ -11,8 +11,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - gwv1b1 "sigs.k8s.io/gateway-api/apis/v1" + gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -32,7 +33,7 @@ func (t *Translator) ProcessEnvoyPatchPolicies(envoyPatchPolicies []*egv1a1.Envo // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Get the IR diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go index de94aaf27e90..8ef13c75c8c9 100644 --- a/internal/gatewayapi/listener.go +++ b/internal/gatewayapi/listener.go @@ -10,6 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -237,7 +238,7 @@ func processAccessLog(envoyproxy *egv1a1.EnvoyProxy) *ir.AccessLog { return irAccessLog } -func processTracing(gw *gwapiv1.Gateway, envoyproxy *egv1a1.EnvoyProxy) *ir.Tracing { +func processTracing(gw *gwapiv1b1.Gateway, envoyproxy *egv1a1.EnvoyProxy) *ir.Tracing { if envoyproxy == nil || envoyproxy.Spec.Telemetry == nil || envoyproxy.Spec.Telemetry.Tracing == nil { diff --git a/internal/gatewayapi/listener_test.go b/internal/gatewayapi/listener_test.go index ddecda17adab..2f2752b72a86 100644 --- a/internal/gatewayapi/listener_test.go +++ b/internal/gatewayapi/listener_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egcfgv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -18,14 +18,14 @@ import ( func TestProcessTracing(t *testing.T) { cases := []struct { - gw gwapiv1.Gateway + gw gwapiv1b1.Gateway proxy *egcfgv1a1.EnvoyProxy expected *ir.Tracing }{ {}, { - gw: gwapiv1.Gateway{ + gw: gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: "fake-gw", Namespace: "fake-ns", diff --git a/internal/gatewayapi/resource.go b/internal/gatewayapi/resource.go index 6a8f37e33b1b..b588eeea92ae 100644 --- a/internal/gatewayapi/resource.go +++ b/internal/gatewayapi/resource.go @@ -13,7 +13,6 @@ import ( v1 "k8s.io/api/core/v1" discoveryv1 "k8s.io/api/discovery/v1" "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" @@ -31,9 +30,9 @@ type InfraIRMap map[string]*ir.Infra type Resources struct { // This field is only used for marshalling/unmarshalling purposes and is not used by // the translator - GatewayClass *gwapiv1.GatewayClass `json:"gatewayClass,omitempty" yaml:"gatewayClass,omitempty"` - Gateways []*gwapiv1.Gateway `json:"gateways,omitempty" yaml:"gateways,omitempty"` - HTTPRoutes []*gwapiv1.HTTPRoute `json:"httpRoutes,omitempty" yaml:"httpRoutes,omitempty"` + GatewayClass *gwapiv1b1.GatewayClass `json:"gatewayClass,omitempty" yaml:"gatewayClass,omitempty"` + Gateways []*gwapiv1b1.Gateway `json:"gateways,omitempty" yaml:"gateways,omitempty"` + HTTPRoutes []*gwapiv1b1.HTTPRoute `json:"httpRoutes,omitempty" yaml:"httpRoutes,omitempty"` GRPCRoutes []*gwapiv1a2.GRPCRoute `json:"grpcRoutes,omitempty" yaml:"grpcRoutes,omitempty"` TLSRoutes []*gwapiv1a2.TLSRoute `json:"tlsRoutes,omitempty" yaml:"tlsRoutes,omitempty"` TCPRoutes []*gwapiv1a2.TCPRoute `json:"tcpRoutes,omitempty" yaml:"tcpRoutes,omitempty"` @@ -56,8 +55,8 @@ type Resources struct { func NewResources() *Resources { return &Resources{ - Gateways: []*gwapiv1.Gateway{}, - HTTPRoutes: []*gwapiv1.HTTPRoute{}, + Gateways: []*gwapiv1b1.Gateway{}, + HTTPRoutes: []*gwapiv1b1.HTTPRoute{}, GRPCRoutes: []*gwapiv1a2.GRPCRoute{}, TLSRoutes: []*gwapiv1a2.TLSRoute{}, Services: []*v1.Service{}, diff --git a/internal/gatewayapi/resource_test.go b/internal/gatewayapi/resource_test.go index 8b9fddc0fcdb..a3749eeb94a8 100644 --- a/internal/gatewayapi/resource_test.go +++ b/internal/gatewayapi/resource_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func TestEqualXds(t *testing.T) { @@ -25,7 +25,7 @@ func TestEqualXds(t *testing.T) { desc: "different resources", a: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, @@ -34,7 +34,7 @@ func TestEqualXds(t *testing.T) { }, b: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", }, @@ -47,14 +47,14 @@ func TestEqualXds(t *testing.T) { desc: "same order resources are equal", a: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, }, }, { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", }, @@ -63,14 +63,14 @@ func TestEqualXds(t *testing.T) { }, b: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, }, }, { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", }, @@ -83,14 +83,14 @@ func TestEqualXds(t *testing.T) { desc: "out of order resources are equal", a: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, }, }, { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", }, @@ -99,14 +99,14 @@ func TestEqualXds(t *testing.T) { }, b: &ControllerResources{ { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "bar", }, }, }, { - GatewayClass: &gwapiv1.GatewayClass{ + GatewayClass: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go index e29c8f0502cd..d4f045a1cc9f 100644 --- a/internal/gatewayapi/route.go +++ b/internal/gatewayapi/route.go @@ -17,6 +17,7 @@ import ( "k8s.io/utils/ptr" 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" "github.com/envoyproxy/gateway/internal/ir" @@ -38,14 +39,14 @@ var ( ) type RoutesTranslator interface { - ProcessHTTPRoutes(httpRoutes []*gwapiv1.HTTPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*HTTPRouteContext + ProcessHTTPRoutes(httpRoutes []*gwapiv1b1.HTTPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*HTTPRouteContext ProcessGRPCRoutes(grpcRoutes []*gwapiv1a2.GRPCRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*GRPCRouteContext ProcessTLSRoutes(tlsRoutes []*gwapiv1a2.TLSRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*TLSRouteContext ProcessTCPRoutes(tcpRoutes []*gwapiv1a2.TCPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*TCPRouteContext ProcessUDPRoutes(udpRoutes []*gwapiv1a2.UDPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*UDPRouteContext } -func (t *Translator) ProcessHTTPRoutes(httpRoutes []*gwapiv1.HTTPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*HTTPRouteContext { +func (t *Translator) ProcessHTTPRoutes(httpRoutes []*gwapiv1b1.HTTPRoute, gateways []*GatewayContext, resources *Resources, xdsIR XdsIRMap) []*HTTPRouteContext { var relevantHTTPRoutes []*HTTPRouteContext for _, h := range httpRoutes { diff --git a/internal/gatewayapi/securitypolicy.go b/internal/gatewayapi/securitypolicy.go index 962ff54b46de..ba45234e02d5 100644 --- a/internal/gatewayapi/securitypolicy.go +++ b/internal/gatewayapi/securitypolicy.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/ptr" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -229,7 +229,7 @@ func resolveSecurityPolicyGatewayTargetRef( targetNs := policy.Spec.TargetRef.Namespace // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Find the Gateway @@ -282,7 +282,7 @@ func resolveSecurityPolicyRouteTargetRef( targetNs := policy.Spec.TargetRef.Namespace // If empty, default to namespace of policy if targetNs == nil { - targetNs = ptr.To(gwv1b1.Namespace(policy.Namespace)) + targetNs = ptr.To(gwv1.Namespace(policy.Namespace)) } // Check if the route exists diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.in.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.in.yaml index 391eeb060bfa..40345df6d049 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.in.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-btls @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: httproute-btls diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml index b38d38425b9f..94d89c8b8a3c 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -32,7 +32,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -73,7 +73,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.in.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.in.yaml index f935b78dc7d2..f4aec31e6d33 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.in.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-btls @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: httproute-btls diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml index 8b258dac8db5..f8f96897d0b0 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -31,7 +31,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -72,7 +72,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.in.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.in.yaml index d11c1a5f2890..83b86d6c6353 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.in.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-btls @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: httproute-btls diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml index ae583f55e474..adf0e3914ee5 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -32,7 +32,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -73,7 +73,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.in.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.in.yaml index 88fb94bc116d..1c9155b419cb 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.in.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-btls @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: httproute-btls diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml index 760e78640484..6782eb5984aa 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -28,7 +28,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -69,7 +69,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.in.yaml b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.in.yaml index f773f200881f..776fdf4dd77d 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.in.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-btls @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: httproute-btls diff --git a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml index d2f92086f1a9..61ca20d2a31c 100755 --- a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml @@ -33,7 +33,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -74,7 +74,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.in.yaml index f45af0115bee..d32eb26fe527 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml index 23c2e1c1f5c4..9e22396aa1af 100755 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -71,7 +71,7 @@ backendTrafficPolicies: type: Overridden controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -112,7 +112,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -150,7 +150,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.in.yaml index 23d2e8d2afca..b544a1898b86 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -62,7 +62,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml index 7cbbb2660581..fbaf80d18821 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml @@ -104,7 +104,7 @@ backendTrafficPolicies: type: Overridden controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -144,7 +144,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -219,7 +219,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -257,7 +257,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.in.yaml index ac4333ec7526..c39caeb1937c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -62,7 +62,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml index 867a99f85bc1..86509955106d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml @@ -86,7 +86,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -126,7 +126,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -201,7 +201,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -239,7 +239,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.in.yaml index dc6513eeec11..a3ea2ea6b1c8 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml index 1324a75e0ef9..42c601ff864f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml @@ -65,7 +65,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -105,7 +105,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -180,7 +180,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.in.yaml index bd11501ac106..64ba1e587308 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -62,7 +62,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -81,7 +81,7 @@ httpRoutes: backendRefs: - name: service-2 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml index 34b5a13021e9..16347733c108 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml @@ -199,7 +199,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -239,7 +239,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -314,7 +314,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -352,7 +352,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -390,7 +390,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.in.yaml index 5f8b1a5f236a..9283825589c1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -62,7 +62,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index f47f84a874a9..58eac467ffff 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -126,7 +126,7 @@ backendTrafficPolicies: type: Overridden controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -166,7 +166,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -241,7 +241,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -279,7 +279,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.in.yaml index c1136403c360..8cdb71feb65c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml index 26e2ac288e99..211bc372042f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml @@ -50,7 +50,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -91,7 +91,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.in.yaml index c1d34e704800..583cac7c77f6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml index 3100a7e26df4..ce89f3e590e5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml @@ -54,7 +54,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -95,7 +95,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.in.yaml index e6a595b157a8..b2d8c2b5de4d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml index 853a1ac1c5fc..30fb803790c0 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml @@ -50,7 +50,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -91,7 +91,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.in.yaml index 9a2f3b942468..26e323b7d355 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml index 7acba1f616b1..21cd605beee0 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml @@ -57,7 +57,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -98,7 +98,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.in.yaml index 7f9d36ab4840..c362cc7dbcdc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml index 624ffa153841..e2d74afd17f0 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -53,7 +53,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -94,7 +94,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.in.yaml index 93d2e9808370..714d63c0b0d1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml index b43f116ef089..34b2764f6675 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml @@ -57,7 +57,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -97,7 +97,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -172,7 +172,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.in.yaml index 72a5e4d8b7c7..a11e610abf81 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml index 50bf055b039a..f4d5f3877c73 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -41,7 +41,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.in.yaml index cc6fa9714ed6..d0363854cf54 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index 21a149aa542c..94f2b330a8cc 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -77,7 +77,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -117,7 +117,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -192,7 +192,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.in.yaml index 6ed617254cc6..93cfbeae51ca 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml index b3c699e39a39..768b2bce35a2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml @@ -76,7 +76,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -116,7 +116,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -191,7 +191,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.in.yaml index 18612699537f..46d79dd870d5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml index aa69f61da8ee..5f46eb2b6198 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -31,7 +31,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -72,7 +72,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -110,7 +110,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.in.yaml index df14e30971bb..6d6c4aa0a13e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml index 0610f61fb9c1..fc3bb81018f7 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml @@ -61,7 +61,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -101,7 +101,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -176,7 +176,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.in.yaml index 8025e82f1d8b..dfe561ac3fb9 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml index d54df2b9e25a..4a8c459de705 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -32,7 +32,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml index c73a4504d4c2..95791b638be2 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml index 4af65e3ca359..778ccb2fcb98 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml @@ -65,7 +65,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -105,7 +105,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -180,7 +180,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.in.yaml index 11204555a039..39cdf544f2e3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.in.yaml @@ -47,7 +47,7 @@ clientTrafficPolicies: namespace: envoy-gateway sectionName: http-3 gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml index 308d12d79481..ba270dff2a24 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml @@ -95,7 +95,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.in.yaml index 82a60c2c033c..7a7f6d830433 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.in.yaml @@ -13,7 +13,7 @@ clientTrafficPolicies: name: gateway-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml index a3bf3ad5ce27..9c6b05162e6d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml @@ -28,7 +28,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.in.yaml index 8d54877593de..0e26f69478ab 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.in.yaml @@ -44,7 +44,7 @@ clientTrafficPolicies: sectionName: http-3 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml index 1165ba87e915..5e044bc926ef 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml @@ -92,7 +92,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.in.yaml index 7454914952b3..aa080933cd85 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.in.yaml @@ -12,7 +12,7 @@ clientTrafficPolicies: name: gateway-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -41,7 +41,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml index bfdd73846a29..94c1617e1a17 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -27,7 +27,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -74,7 +74,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.in.yaml index 05ff5b872945..a3f3d529d2f1 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.in.yaml @@ -33,7 +33,7 @@ clientTrafficPolicies: name: ca-configmap namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -58,7 +58,7 @@ gateways: allowedRoutes: namespaces: from: Same -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml index e5ee7a11a3cd..7b51747101d6 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml @@ -66,7 +66,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -142,7 +142,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.in.yaml index 9ce6115418c9..db0c76e62e67 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.in.yaml @@ -14,7 +14,7 @@ clientTrafficPolicies: name: gateway-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml index 419fbf076aa1..199ac7efddda 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml @@ -29,7 +29,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.in.yaml index 5a5711f32edd..bc78c866c181 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.in.yaml @@ -14,7 +14,7 @@ clientTrafficPolicies: name: gateway-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml index 7deea550663f..3f7c7b42a67d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml @@ -29,7 +29,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.in.yaml index 5198e82d0985..c34f937974b2 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.in.yaml @@ -13,7 +13,7 @@ clientTrafficPolicies: sectionName: http-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml index dd61eb7fe89d..94976c7aafc3 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml @@ -29,7 +29,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.in.yaml index 0f44d839bbd9..ebebfac6cabf 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.in.yaml @@ -103,7 +103,7 @@ clientTrafficPolicies: namespace: envoy-gateway sectionName: foo-bar gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -117,7 +117,7 @@ gateways: allowedRoutes: namespaces: from: Same -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -143,7 +143,7 @@ gateways: allowedRoutes: namespaces: from: Same -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -157,7 +157,7 @@ gateways: allowedRoutes: namespaces: from: Same -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: not-same-namespace diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml index 5527116ad7d1..6616f3c93da9 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml @@ -239,7 +239,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -279,7 +279,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -370,7 +370,7 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: TCPRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -410,7 +410,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.in.yaml index d263b45df772..8f913eb26a66 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.in.yaml @@ -28,7 +28,7 @@ clientTrafficPolicies: sectionName: http-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml index fa977c27444e..64a92562eff1 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -65,7 +65,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.in.yaml index b9cad3568bc3..208bd1f51263 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.in.yaml @@ -14,7 +14,7 @@ clientTrafficPolicies: http: requestReceivedTimeout: "5sec" gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml index 245a10810b38..45fc35747370 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml @@ -29,7 +29,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.in.yaml index 0c962e72fe88..a40be71c79bd 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.in.yaml @@ -15,7 +15,7 @@ clientTrafficPolicies: http: requestReceivedTimeout: "5s" gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml index d4fedc923722..f7a49b8fdc57 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml @@ -31,7 +31,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.in.yaml index 7d23dc8b307a..5e955d758796 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.in.yaml @@ -24,7 +24,7 @@ clientTrafficPolicies: - sig1 - sig2 gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml index e4fcd514d154..99cb4fe1cc7a 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml @@ -39,7 +39,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.in.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.in.yaml index c9b087d3ff41..41a7c1658145 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.in.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.in.yaml @@ -13,7 +13,7 @@ clientTrafficPolicies: name: gateway-1 namespace: envoy-gateway gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml index cf3abc4f51d1..11dd7b357412 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml @@ -28,7 +28,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/conflicting-policies.in.yaml b/internal/gatewayapi/testdata/conflicting-policies.in.yaml index 79e07e489192..9b6854a7c232 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.in.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.in.yaml @@ -7,7 +7,7 @@ envoyproxy: spec: mergeGateways: true gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: gateway-1 @@ -22,7 +22,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: mfqjpuycbgjrtdww @@ -35,7 +35,7 @@ gateways: port: 80 protocol: HTTP httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: bdkzlmibsivuiqav @@ -57,7 +57,7 @@ httpRoutes: - path: type: PathPrefix value: / -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: mfqjpuycbgjrtdww diff --git a/internal/gatewayapi/testdata/conflicting-policies.out.yaml b/internal/gatewayapi/testdata/conflicting-policies.out.yaml index d8b882d368a0..f65856ec3212 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -30,7 +30,7 @@ clientTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -110,7 +110,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -153,7 +153,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/disable-accesslog.in.yaml b/internal/gatewayapi/testdata/disable-accesslog.in.yaml index 2125a0d63de2..73785cb3caf2 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.in.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.in.yaml @@ -57,7 +57,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index c181084ce7cc..a5cd611a8d13 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.in.yaml index ee6050b5118c..e44bc28e2548 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.in.yaml @@ -19,7 +19,7 @@ envoyPatchPolicies: path: "/per_connection_buffer_limit_bytes" value: "1024" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml index 1abf6f7b392b..3c50e15ee7e6 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.in.yaml index 4942b8030925..0a0716381400 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.in.yaml @@ -27,7 +27,7 @@ envoyPatchPolicies: path: "/per_connection_buffer_limit_bytes" value: "1024" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml index 711b21017b21..2c3584dbc222 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.in.yaml index 573018430f23..05feb6caedf7 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.in.yaml @@ -27,7 +27,7 @@ envoyPatchPolicies: path: "/per_connection_buffer_limit_bytes" value: "1024" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml index bccd6afd4796..cf7bb3d9e25d 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.in.yaml index 57a5d4abd148..7506737e8c21 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.in.yaml @@ -19,7 +19,7 @@ envoyPatchPolicies: path: "/per_connection_buffer_limit_bytes" value: "1024" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml index 9db1977241cd..a5140e1209b6 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.in.yaml index d3604de13637..ea203cfa6846 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.in.yaml @@ -48,7 +48,7 @@ envoyPatchPolicies: path: "/ignore_global_conn_limit" value: "true" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml index 714ecafe2edd..44d99d7f5114 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.in.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.in.yaml index 4cbe335873b4..59c899834de1 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.in.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.in.yaml @@ -40,7 +40,7 @@ envoyPatchPolicies: path: "/ignore_global_conn_limit" value: "true" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index 0b958297b20c..5f50d39311f9 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml index 284524f470ee..746e64c864b1 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml @@ -63,7 +63,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml index 38dc310911b7..be7bc4e48855 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml index e0c851aea6ce..939f47726f30 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml @@ -66,7 +66,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml index 938b626c7a26..f12fc65b41cb 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml index c58833612223..ccf9aa8e682a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml @@ -64,7 +64,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml index 380b27a715a0..3a498ff94cc9 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml index 103bd702a34f..951836166cd6 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml @@ -71,7 +71,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 0b7a942a01c6..5fc0cdea4c24 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml index dfdb1ac4f43e..c2bb8eb078ef 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml @@ -54,7 +54,7 @@ envoyproxy: secret: secretName: envoy-cert gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index 92f6d9b55808..11bd3fd38e64 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.in.yaml index ba7eec6c05db..99c9bcac4f74 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml index b772bd943c9f..4453f4b95971 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.in.yaml index d4f0fc1f9e5d..41bc18284be6 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml index 8bab973f1e6d..b24fb5367b5d 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.in.yaml index 5d73bfa1b4c5..7fadc6175924 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml index 4f318617bedf..b76e780b71de 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.in.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.in.yaml index d44fa65086b4..2b236fd55da8 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.in.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml index b468c423db54..7404b82bb45f 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.in.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.in.yaml index 0dd2519dc9d0..e586a45b9612 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.in.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: Same httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml index 4b5c58da3f16..0b13f1ec1a03 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.in.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.in.yaml index 40c54eff3c36..8ba0171af8b8 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.in.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: Same httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml index 4d0863926db1..43f13a342758 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.in.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.in.yaml index fa6d6455124c..10d8af2205fd 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.in.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -47,7 +47,7 @@ gateways: reason: Programmed message: Listener has been successfully translated httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml index 2eac73861c63..39d885e0bde3 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -53,7 +53,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.in.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.in.yaml index e4194dd153ca..1be00724e666 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml index 7424d6332bf5..40ea784e1573 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.in.yaml index 7c71b1eaa65a..dace4dd1e139 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -20,7 +20,7 @@ gateways: values: - bar httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml index 6525ecfc32ee..87328bd964ea 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -43,7 +43,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.in.yaml index e31eab269629..bb2bf841df6c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -17,7 +17,7 @@ gateways: - group: foo.io kind: HTTPRoute httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml index 182b2b173132..29028fea7539 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -34,7 +34,7 @@ gateways: name: http supportedKinds: [] httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.in.yaml index 3c1d72a73faf..eaa066350a7e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -19,7 +19,7 @@ gateways: - group: kind: HTTPRoute httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml index a21d579d0e82..f4cd5e80ca13 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -36,7 +36,7 @@ gateways: supportedKinds: - kind: HTTPRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.in.yaml index dd3061ecf2a3..70c85d2b7812 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -17,7 +17,7 @@ gateways: - group: gateway.networking.k8s.io kind: FooRoute httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml index 460da331ff4e..d328fc7dc944 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -34,7 +34,7 @@ gateways: name: http supportedKinds: [] httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.in.yaml index ee989f7fa0f7..c5762afbaffe 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml index a7dbadf7fd04..123f786e533f 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml index be3ac0e7b8f6..5af26f66feb2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -48,7 +48,7 @@ secrets: data: tls.key: YmFyCg== httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml index d503d2875cb2..2872e7719413 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -49,7 +49,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.in.yaml index e0f69d01a324..a4793ddeff2e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -29,7 +29,7 @@ secrets: tls.crt: Zm9vCg== tls.key: YmFyCg== httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml index f5b1bd561dd3..1fc2859107ac 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -42,7 +42,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.in.yaml index 54feff74698a..d60c39b55c6e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -26,7 +26,7 @@ secrets: tls.crt: Zm9vCg== tls.key: YmFyCg== httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml index 84dd3118e90b..0fa501b47753 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -37,7 +37,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.in.yaml index 0c3a5060b852..bb6edc89b32c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -29,7 +29,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml index d67fa87f9b69..ec390433c816 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -44,7 +44,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.in.yaml index 95bffc38bbeb..0b68948ea738 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -18,7 +18,7 @@ gateways: certificateRefs: - name: tls-secret-1 httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml index cac358ab651a..2e2cab92b453 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.in.yaml index caab5079f9cd..0bee2931391e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -29,7 +29,7 @@ secrets: tls.crt: Zm9vCg== tls.key: YmFyCg== httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml index 3c27f730a575..c7f2de75ac23 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -43,7 +43,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.in.yaml index 75e6051a21b6..c1ff4fb2c61d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -27,7 +27,7 @@ secrets: data: tls.key: YmFyCg== httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml index 72c30d421494..715c9e8f985f 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.in.yaml index f24ab41fe4d3..6d2bed7a3397 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: Selector httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml index 2e8f83dbaf99..4e660fa130b2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -36,7 +36,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.in.yaml index f027c23e67ff..1be8e3b6948b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml index 50308df1df7e..889944ed1189 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.in.yaml index 1cc29af9d38c..049bb0ea0594 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml index 9ad4d5f2eb1c..e6f25bfab8a9 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.in.yaml index f0291a53162d..3e5271710c30 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml index d68f758d4732..43387720ce86 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.in.yaml index 179769001d8e..52cfed69655e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml index 73accd49f5bd..5aa02d1b2668 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.in.yaml index 2882a44c1805..c92484988dc0 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -29,7 +29,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml index b1f4d6530d0e..5cc70346224b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -47,7 +47,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.in.yaml index 09c8d2137373..a241fbab2893 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -42,7 +42,7 @@ tlsRoutes: - name: service-2 port: 8080 httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml index 88856e37f642..9e29fef199c8 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -77,7 +77,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.in.yaml index f8e9d3859d8c..5da384704ec3 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml index c3022120b3f5..3d71a4efb2bb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.in.yaml index 440e8c9fd555..3f59d61eb8e6 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml index 865462529472..3ea6e5c9fe19 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.in.yaml index 6dfe97fba5e6..7b8bad988c2d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml index bed2cc4aa374..83ec945ecb48 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.in.yaml index ecb2d33e09f6..1cf9356840b9 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml index 51b012385201..f1fa9151803e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.in.yaml index bba95249356d..dc4f8e805213 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml index 74e11eb415af..de645113f5b1 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.in.yaml index 2f7fa01b58c9..a16990831216 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml index cee2e52e84eb..45eaabd1ce20 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.in.yaml index 12598d5c2975..7fe1283b99c3 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml index 123a0171cb65..711de8b33c33 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -36,7 +36,7 @@ gateways: name: unsupported supportedKinds: null httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.in.yaml index 82743664172e..50aa9d14451f 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -38,7 +38,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJZakNCNlFJSkFNcDhYTGNsWGJ2NU1Bb0dDQ3FHU000OUJBTUNNQnN4R1RBWEJnTlZCQU1NRUhSbGMzUXUKWlhoaGJYQnNaUzVqYjIwd0hoY05Nak13TlRJMU1UUXhNRFF5V2hjTk1qUXdOVEkwTVRReE1EUXlXakFiTVJrdwpGd1lEVlFRRERCQjBaWE4wTG1WNFlXMXdiR1V1WTI5dE1IWXdFQVlIS29aSXpqMENBUVlGSzRFRUFDSURZZ0FFCmVNdEhDM2hJZXEyUXNka3RTaS9aTlIvTUtOYXZTbTNITm43dEdvZ2ZxYXFuOEFTZ0hJYTd5VVUrK1Bzb0RENmsKZisrQ2U3dXNkMG1RTzFTbmRZSVdqMlFMaUl6ME5aSDhCL1FyNGk3SjBJS3dzUWxVbnVuWnF2NUtZOVRMUWEwbgpNQW9HQ0NxR1NNNDlCQU1DQTJnQU1HVUNNUUNHVGpQa2hqZE1KcWUrVjFGRWpteUk2andEV0FDalhucFRuaXhVCnM2dUNKZjVNNUw1TmpGYmkydGplMGlES0UxVUNNQXdxSjZmOUs2bUhUd2JxVGkzTVNFMmQxODl6aUcyWVZCaUQKYmVXcHc0UjF5ZTdHRFJvVm9veG9ob2lERjdsNm13PT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tls.key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1JR2tBZ0VCQkRDUUE5VWo0SkR5c0Q0MlJIMGI2cjU5NTlXTmlXU2ZKZlMxK2RvTjk0TzZCUGdaQUJiUTI4eTIKUTZsM3pZdklLeFNnQndZRks0RUVBQ0toWkFOaUFBUjR5MGNMZUVoNnJaQ3gyUzFLTDlrMUg4d28xcTlLYmNjMgpmdTBhaUIrcHFxZndCS0FjaHJ2SlJUNzQreWdNUHFSLzc0Sjd1NngzU1pBN1ZLZDFnaGFQWkF1SWpQUTFrZndICjlDdmlMc25RZ3JDeENWU2U2ZG1xL2twajFNdEJyU2M9Ci0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml index 6d6ac8724c62..712f7d0a638f 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -49,7 +49,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.in.yaml index 58abae4129ea..82c17da2058c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -38,7 +38,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJnVENDQVNlZ0F3SUJBZ0lVRm1sOExCRzBvL1FLNFErWjdrODI0c0MyaUZ3d0NnWUlLb1pJemowRUF3SXcKRmpFVU1CSUdBMVVFQXd3TFptOXZMbUpoY2k1amIyMHdIaGNOTWpRd01qSTVNRGt6TURFd1doY05NelF3TWpJMgpNRGt6TURFd1dqQVdNUlF3RWdZRFZRUUREQXRtYjI4dVltRnlMbU52YlRCWk1CTUdCeXFHU000OUFnRUdDQ3FHClNNNDlBd0VIQTBJQUJMYVl2cUt1VlZveERvNTJlV3p2WUI1anc3RU1GODZybXlvaTVadWF5emRNdnBnNHpCcjgKUktCak5zK1QxakI4T0t1Y1MvN1JVRHgwcHorOTc2ek0zaU9qVXpCUk1CMEdBMVVkRGdRV0JCVE82K2NnMFIwZAp3dHJ6SlFQRzZnNzZoQkJVelRBZkJnTlZIU01FR0RBV2dCVE82K2NnMFIwZHd0cnpKUVBHNmc3NmhCQlV6VEFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUFvR0NDcUdTTTQ5QkFNQ0EwZ0FNRVVDSVFDMlhwUFFnUXpXYWUzYjVwWnQKR2N1TWZESjBjME9QS2NuZWdrWFoyQzRCM2dJZ1Uvc1Jrd0lwTFFOUlYrRWFZdzRQNVQ1Z1BFNlkrVnBtQzk4aApvVmpaL3pRPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t tls.key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUxEbnZNM1RKM3NHYm9EeTF4T3dqSVppVFNWeWZXVWF5YVExcWdrdUdacEtvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFSDVWdHJjenJQS091alV5RTMyaDU2UnVrdHUzSVhTVnJJMkNibXh5UUpqcEY3di9rNVNqTQpSVXZjUnBCdmpnQWROaGhUNGNUMXV4YW1TMFlmQ2JXMVhRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml index a4499bc066ee..0da315e1864d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -49,7 +49,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.in.yaml index 6949425c3555..31ed9230a47c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -28,7 +28,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml index 9380a03ce6c1..bc8793961a98 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -46,7 +46,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.in.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.in.yaml index 88a3c06d4ba5..1e3c087a464d 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -26,7 +26,7 @@ gateways: reason: Programmed message: Listener has been successfully translated httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml index d2dce6e0af75..0f97666cf79f 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.in.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.in.yaml index 27fc4622a0df..131957291733 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml index f332997f2c53..f38ea0054ac1 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.in.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.in.yaml index 0d8be2905503..a5c8561df8e9 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml index 708916becce4..3449d2b79f92 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.in.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.in.yaml index f40fbbe83077..fda3aaa015a9 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -40,7 +40,7 @@ gateways: reason: Programmed message: Listener has been successfully translated httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml index 05ae433a1a5f..f3ec267696a3 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -46,7 +46,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.in.yaml index 049c79741380..fc0744606b6c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml index 532e03227db8..d927d3fa5f8b 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.in.yaml index 50601282fce0..b76a4678043c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml index 64b52d04f8ed..b169cc2c2f4b 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.in.yaml index 90fe76523f8a..e3bfa5023562 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -24,7 +24,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml index dfe1d49dc37f..76b98a6977e3 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: TLSRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.in.yaml index d0cadfda02cf..65b6ed82eba4 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -38,7 +38,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml index 267296982ad3..6facbe595bff 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -105,7 +105,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.in.yaml index 69b93f3b1a6b..69b6f58c0b8e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml index bf051ef6c79c..be51fb03bb64 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.in.yaml index 37c0a342f3b7..981e2604510e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml index acbd772d0f6e..30ff5ea2d990 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.in.yaml index 34bd7a43e6f8..a72962050012 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -21,7 +21,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml index 61119e9b76a9..1d3a416275ee 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -68,7 +68,7 @@ gateways: - group: gateway.networking.k8s.io kind: TCPRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.in.yaml index d4ef5be9e3f0..9fc9e95903f6 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -21,7 +21,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml index fb19c1102f60..f7a9835fb918 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -68,7 +68,7 @@ gateways: - group: gateway.networking.k8s.io kind: UDPRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.in.yaml index a4bb69bb764d..dbdd26a3d061 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml index 246d53aa32f8..b28bb70a1af9 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.in.yaml index 1ba01ba6cd55..773c926237d6 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml index 1ee22061b3dd..7aa863dfc56b 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.in.yaml index dc3a42ab7057..ab1cc8facb1d 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml index b9a54af45944..2fded8ae7827 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.in.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.in.yaml index 2638f0f19de6..1922d9353d15 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml index 12fe93bd3261..cd2054271bac 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.in.yaml index 69bfd7a1f207..b44876a8a089 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml index 57d5ad03bf5a..d8311550a35e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml index ae2baa8dca13..b6078734a8d3 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index d2abc957458f..ecbd85689a74 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.in.yaml index 82e319fd2640..b7da2bc9300b 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml index 45acfd7e6147..d67f30dbb3f3 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.in.yaml index e2a374d149e7..a95d5fab433c 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 67ed17a35f4d..1cea65454e4a 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml index 2c48dad582e3..56dbf4ed1101 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml index 76f8148dce58..97204cf84a1d 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.in.yaml index ad245cb182ca..912c2f9c4b4b 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index ca598b9d046c..ee160821303a 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.in.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.in.yaml index c95fd9095153..ed4ce3a3ca10 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.in.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml index 001de5ea84ea..a22d6fc5d4a0 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml @@ -32,7 +32,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -73,7 +73,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.in.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.in.yaml index 90157f5e80f0..f13d1fdaac10 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.in.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml index 5ca518d493df..f28f9d576ba2 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml @@ -64,7 +64,7 @@ backendTrafficPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -104,7 +104,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -179,7 +179,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.in.yaml index d44d02d168f8..7ec5ee38330f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -64,7 +64,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml index 9d0c0d570c98..0afce583a916 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -251,7 +251,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.in.yaml index d2078deb76ba..6d6d34395df3 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -64,7 +64,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml index 900412333360..7e5716143204 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -251,7 +251,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml index 2a5c0e34b53a..a36bdd3f9a66 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -34,7 +34,7 @@ secrets: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml index 2fd05635ddf9..e7d0e5ff91fa 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -75,7 +75,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.in.yaml index 8b11c8da7bfb..423193229616 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml index cda246ecc6c4..bb2525cfaf5f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.in.yaml index 2946dfeb1058..9c0f4d4e1a66 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 39834ebc86ea..6d2116e5bd78 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.in.yaml index ec02f88815eb..b40ea29ee4d8 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml index 813d92502778..08dec9ad2eee 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.in.yaml index bc9aba4dd284..6e11d814f18b 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml index bbc2f85502af..5ac09492f764 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -71,7 +71,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.in.yaml index 0c00de607f16..5a438ce510e1 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml index 967713517a0e..feadbfcab93f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.in.yaml index 8ad5fa129060..9f9b9f8796ee 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml index 2a60e150ec6b..bc03af7478f6 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.in.yaml index 7fa56a4ae0dd..8e99cd533819 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml index 369959e0c7de..d8b846981166 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.in.yaml index c58ed15d3f8d..659b06405927 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml index cd98ee93cc89..097cd6395935 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.in.yaml index 26a816b93c8c..b090ab618b4c 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml index 8ffa5793822f..7a4ab40f9c25 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.in.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.in.yaml index 6766b18f543e..34751d39697d 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.in.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 55c1ac1b83d1..2f9217809848 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.in.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.in.yaml index f16077de3292..ed0fc57e493c 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.in.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index e448a02bf2d0..67e9495135d7 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.in.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.in.yaml index 0060019963e6..42d894b26395 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.in.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml index 783b3be7b306..d603dc8435c8 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.in.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.in.yaml index 6cf2210aa3f2..d69d718f6e28 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.in.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index ec80e30e1e8f..d9d7f063c3e9 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.in.yaml b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.in.yaml index ba4acbbc755a..5cb088abc922 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml index d49bb265d46e..1f3923f8b644 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.in.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.in.yaml index 2e9cddb5809c..df9b9983a824 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.in.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml index 048b705766e7..64260ee44f40 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.in.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.in.yaml index e3419de8d982..b302c81d35c7 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.in.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml index 53038b2348be..612be859b234 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml index c1d5723e744e..dc90c9d80f9d 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index b827af53150c..92fd68427722 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.in.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.in.yaml index e445c56366dc..ba04517a1f68 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml index 485d59bcde18..7613166dfd65 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.in.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.in.yaml index 14755bccba1c..9961e34afc79 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 5ef60eccf6a2..3d86c0fe3119 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.in.yaml index 06888796590c..741dd1ab74da 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml index 9d439afa3c62..63a1d15be347 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml index d9dcdc3b2898..7a721b54686d 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml index 7d69c437116c..29da4de6800b 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.in.yaml index 754fc2d97307..f8a8ed022663 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml index f8a325b46ee6..a03ed3e64de4 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.in.yaml index 08fc178a22aa..432dc059e551 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml index 53c939f2b0df..cb29da97986c 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml index c965d329683c..7c22d7c62fed 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml index b5193139bbeb..c3de33460511 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml index 1b47bb7f4ff3..978ef416a6d6 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml index c95a7df7e41c..55c8511e08e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml index aaf5bad87ff0..ecdaf8f42ddd 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml index 949dce73540b..a71e70b33d4f 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.in.yaml index 3b0ede69aee2..9ff34332afe1 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml index c3ab6b9f0210..d18f075f43fa 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.in.yaml index f2bc3162ff0e..be2cdcaafd27 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml index 6102adbb08ea..722d941ba17c 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.in.yaml index 09e213290203..7bbbf94f8c58 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml index 3ac50c40bac5..30e5ff86c48e 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.in.yaml index 85d2eabc26ef..7fbaac576028 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml index 9c3bab389cf1..fb541e54d36a 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.in.yaml index 66905669ee7b..fdb538528efb 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml index 5f78538385f5..c566a3a37477 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.in.yaml index 8914c502c54a..a543072c2694 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml index b38425e7563a..7f0c8cd47f17 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.in.yaml index 90664bbd470e..6a4116f6c459 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml index 6668252cdbc7..9e416e186ab7 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.in.yaml index 35593cde200d..83dd774da95f 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml index da0bce317d6b..dcc84e8e49e4 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.in.yaml index d56d23d0c949..509869600a7b 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml index ddaccd43a104..8ed52c273af5 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.in.yaml index 236a10736d20..91c20070d2ae 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml index f916d3030532..5e6f96104307 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.in.yaml index 833ca4ad07bb..b0f788c5207d 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml index 8d622b366803..7a93f8ca4835 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.in.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.in.yaml index 1b114bdc58e4..bac6b191c01a 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -28,7 +28,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml index 8e676db62f1f..09ad0a130fe3 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -39,7 +39,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -80,7 +80,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.in.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.in.yaml index f366ee752cb7..9bd0ed504de6 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml index 431a85a1dca1..29952dd49e38 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.in.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.in.yaml index 16cc895b808b..950db156b831 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml index 8588726a36eb..1ea0a89885d2 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.in.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.in.yaml index d14154f4a673..3873206e9234 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml index a5b71817a086..43c495d3b279 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.in.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.in.yaml index d2d41de93b1c..b3e9b7f624ee 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml index a9fb238b04f6..695d37368ffd 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.in.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.in.yaml index f428cd3665ee..c624835c1e72 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index d324d2465149..be7c0dd9e315 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml index 51dd2e3d2c23..99f6ba02fdbb 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 293b36390b13..0a0aa7ab9fba 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml index 1ac8958982c7..89255cc6f9cc 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml index 95a7cbdc1d4c..b8da36af0e19 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml index 149f4163f8e8..e3eba62c11b7 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml index 77254975bde7..9015364a0362 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml index 41653f4d9b98..e40076f5b56a 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml index 2491b007b73e..302806bf9ac6 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml index d95553bf0a05..08f0c8340785 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml index 96974409276c..2ac11e2d8092 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml index 67bbbe014a4d..465166fde9a0 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml index e330972e2a84..6e6ca3b7e6c7 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml index b473b7489a62..561197982254 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml index 961afbb26f13..fa8832afec1f 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml index 40cf83e0d7fd..cea778dd95b7 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml index 43c7a116b4b9..6884315c9304 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.in.yaml index ac534639c689..12197e4d1643 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml index 4fba4eb7b99c..24e82c03ba69 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml index 0cebadee072c..42e37c41aaab 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml index 61441d6a1d62..d8058f4ea2bf 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.in.yaml index 7624edfcc8e3..d3374ed743ab 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml index 4f58c01222d7..5cad33c7416a 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.in.yaml index 4cfd6396767d..6d234bcf5f21 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml index 0cd94a754a4a..6db446f3f6a9 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml index 1c0016800d3a..d6e1c760913f 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml index b7f3e26ef42f..040f16baabd5 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml index cca451186c82..2eb722baea5e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml index 50fe9f29aedf..cfdbcb2da92c 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml index 6e1e57425bf6..4c1a29d288e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml index bb974df71b83..5241162efdd6 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.in.yaml index 0f1e790b9d6b..2841ea22237f 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml index 48c3b5f8f5b3..dd31bfd38aef 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.in.yaml index 8120906a4b77..1851a22c97d9 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml index e3c8a6dbec02..9754f02899e3 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.in.yaml index 413ec03c8b15..1e83e0d15a24 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml index 1ea53e4797df..d072a9b5fa1e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.in.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.in.yaml index af7ae3628248..ce166fe94114 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml index 0b9bc1037ecc..1be514f8531a 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml index ee032081642c..3d372e82c8d0 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml index 291e21eebccf..f83af3866ee5 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.in.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.in.yaml index 2ec00c37a8f9..9fd68520b168 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml index 6cdc1ed6c56b..3992ef5214a2 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.in.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.in.yaml index 7709a6945d01..3c8a4d791a3b 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml index b16e4cfe932f..1209e2de80a8 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.in.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.in.yaml index dbd94a92b56f..b11330744b17 100644 --- a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml index ad7e977d4a85..3763d2851f83 100644 --- a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml index 87e9eedbb953..7396ea600d80 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 2beec1c17f53..a72f3e3aa3f7 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.in.yaml index fb2e342f211c..34c4cf7c439e 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml index a2a913ec417a..e726f468d52b 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.in.yaml index d31a159837f8..a9d0eed0a4de 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml index 8b2138f2100b..65d4ffc3e08f 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.in.yaml index 38e9a2f2ffcc..81b7145ebc41 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml index 9ea570c292b0..ae9641a9db0c 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.in.yaml index d9b220fd34c2..20c01dad0562 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml index bf682e88b35c..12f9b64b3025 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.in.yaml index dbfc732c089b..17a0293da6b2 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml index b85ff6e2db35..a0f0fe5866d3 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.in.yaml index bcd778f9c29a..9aef23666fdd 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml index 448b7518fc0a..f8db8381d788 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.in.yaml index 1b8366455e26..4a80b8390a43 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml index cac49f264afa..9f7d6282a5ad 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.in.yaml index 11b7ff298c7c..8feeaffc6030 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml index a8e83b7761e7..8d3e70ce6b89 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.in.yaml index 555a6dbf5da7..fb33211a0866 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml index 9633fa077b56..7538125d6e70 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.in.yaml index a89a9e7722e9..99c0c5f6b803 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml index 7ff23ecae5d1..b95fcab3e115 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.in.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.in.yaml index c4597755cc3e..a11190c3195b 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -15,7 +15,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml index bc23aabd4d75..88c013e2dc64 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -41,7 +41,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.in.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.in.yaml index d61cae0499e0..91a92c15c6f6 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml index 8d436c384cb2..25ef859d9e9e 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.in.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.in.yaml index 7315f3f4faa8..7d7a3dd5b678 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.in.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: Same httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway @@ -30,7 +30,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway @@ -49,7 +49,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway @@ -70,7 +70,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway @@ -88,7 +88,7 @@ httpRoutes: backendRefs: - name: service-2 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway @@ -109,7 +109,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index 325c79da51dc..ffebc414a561 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -74,7 +74,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -111,7 +111,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -150,7 +150,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -186,7 +186,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -225,7 +225,7 @@ httpRoutes: parentRef: name: gateway-1 namespace: envoy-gateway -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.in.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.in.yaml index 888c4e4b7133..852e57e19f3c 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.in.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.in.yaml @@ -52,7 +52,7 @@ gateways: namespaces: from: Same httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -71,7 +71,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -90,7 +90,7 @@ httpRoutes: backendRefs: - name: service-2 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -109,7 +109,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml index 15e35504f913..1dc5b40154ef 100755 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -235,7 +235,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -273,7 +273,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -311,7 +311,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http-2 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -349,7 +349,7 @@ httpRoutes: name: gateway-2 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.in.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.in.yaml index 2ce31b166c6a..bdb2961d137c 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.in.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.in.yaml @@ -36,7 +36,7 @@ gateways: namespaces: from: Same httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -55,7 +55,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml index 2da58361ab6c..9a03bfcebdc4 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -141,7 +141,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -179,7 +179,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.in.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.in.yaml index d43a1c067343..75f04ced2ba6 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml index 3bb9ae1338d8..c532ee01f5e6 100755 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.in.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.in.yaml index 3ab602888d52..ce440e31c77e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml index 1224320c6315..685d100d317e 100755 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -78,7 +78,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.in.yaml index 619425c9bdbe..80c3451780be 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.in.yaml @@ -7,7 +7,7 @@ secrets: data: .htpasswd: "dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=" gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -22,7 +22,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml index d862fd9d11e5..f93b60fa1ac8 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.in.yaml index 3b7737264484..579d2a471d0c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -27,7 +27,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -57,7 +57,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -76,7 +76,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index 943ea81307a3..941405b05c0e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -39,7 +39,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -79,7 +79,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -154,7 +154,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -192,7 +192,7 @@ httpRoutes: name: gateway-2 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.in.yaml index 91b51dbf237d..e5178368b9e0 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml index 0868f2ae76de..ba7d5a6b9279 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.in.yaml index 1f38853fbe18..8c2c54d4a6a6 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml index 115a3ba7436d..589ac5ac90de 100755 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.in.yaml index 64b15b558b4b..f29365327688 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml index 1e547408f254..f27b1c0c7af3 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.in.yaml index 2ab00957c3f7..41a4830b78a2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml index 47720b9bbb07..48b9893c81bd 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.in.yaml index a088e08d16d2..6cb4097973e6 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml index 5b413d594320..a36e544f0ddb 100755 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -65,7 +65,7 @@ backendTLSPolicies: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -106,7 +106,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -144,7 +144,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.in.yaml index 12142460fa3b..9a1bfe769223 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml index 93666da42bb3..b4e731398f21 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -78,7 +78,7 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.in.yaml index 833c2b70c136..2f7698ee5fb3 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -14,7 +14,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -33,7 +33,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml index a8e01e48023a..1822067b9faa 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -78,7 +78,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.in.yaml index 4c43bc662e0e..17de24404d8c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml index 2ea03bafc0bf..80f3166cf593 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -39,7 +39,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -114,7 +114,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.in.yaml index 4e51d2c903cc..2f1818ac3b2e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -13,7 +13,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ grpcRoutes: - name: service-1 port: 8080 httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml index 6af406789f94..b473336f1caa 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -39,7 +39,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -114,7 +114,7 @@ grpcRoutes: namespace: envoy-gateway sectionName: http httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.in.yaml index 169c7b94ecc4..6c0bd39c0282 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.in.yaml @@ -7,7 +7,7 @@ secrets: data: client-secret: Y2xpZW50MTpzZWNyZXQK gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml index bc8e64eeeda6..12de80f062a1 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.in.yaml index 565159c0175a..5010b510774f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.in.yaml @@ -15,7 +15,7 @@ secrets: invalid_client_secret_key: Y2xpZW50MTpzZWNyZXQK gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -29,7 +29,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default @@ -43,7 +43,7 @@ gateways: allowedRoutes: namespaces: from: All -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml index 34c9a927508f..be996135a690 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -39,7 +39,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -79,7 +79,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml index 303d05191f79..ebfc8fc02e0a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.in.yaml @@ -28,7 +28,7 @@ secrets: data: hmac-secret: qrOYACHXoe7UEDI/raOjNSx+Z9ufXSc/22C3T6X/zPY= gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway @@ -43,7 +43,7 @@ gateways: namespaces: from: All httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default @@ -62,7 +62,7 @@ httpRoutes: backendRefs: - name: service-1 port: 8080 -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: namespace: default diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml index ad55d9bba651..07d3e43d9b89 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null @@ -40,7 +40,7 @@ gateways: - group: gateway.networking.k8s.io kind: GRPCRoute httpRoutes: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null @@ -78,7 +78,7 @@ httpRoutes: name: gateway-1 namespace: envoy-gateway sectionName: http -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.in.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.in.yaml index b4beac9da1e0..40735cd7b0b9 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.in.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml index b4ac4a13faaf..391e33df9e07 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.in.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.in.yaml index a10119662ddc..71db6c0ece6f 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index c5156d74c40f..67dd52edd3b2 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.in.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.in.yaml index e7d44bece2bb..46222c6ce091 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index ada467afc073..5905729a7377 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.in.yaml b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.in.yaml index f37773dbd8df..38395404cd8c 100644 --- a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml index af1a22807e7d..a20232f07ea5 100644 --- a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml index 00e85a873704..dbb0eb52d13d 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index c4a9bb0ee13d..da9300f25e78 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.in.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.in.yaml index 76f60b0752e3..39e8ba661de8 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index 8b6843bf49ab..7dd0410ebca1 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.in.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.in.yaml index 621f046a9b48..a91b6fdb83ea 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.in.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml index 493fbf296d41..353c7cb15eee 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.in.yaml b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.in.yaml index 26a91e256a0c..81afa2331b15 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.in.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.in.yaml @@ -1,5 +1,5 @@ gateways: - - apiVersion: gateway.networking.k8s.io/v1 + - apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: namespace: envoy-gateway diff --git a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml index b25e52b26634..f47984c55464 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml @@ -1,5 +1,5 @@ gateways: -- apiVersion: gateway.networking.k8s.io/v1 +- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: creationTimestamp: null diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go index 83a819fbd234..4a0455c13a96 100644 --- a/internal/gatewayapi/translator.go +++ b/internal/gatewayapi/translator.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" egv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/ir" @@ -54,7 +55,7 @@ var _ TranslatorManager = (*Translator)(nil) type TranslatorManager interface { Translate(resources *Resources) *TranslateResult - GetRelevantGateways(gateways []*gwapiv1.Gateway) []*GatewayContext + GetRelevantGateways(gateways []*gwapiv1b1.Gateway) []*GatewayContext RoutesTranslator ListenersTranslator @@ -218,7 +219,7 @@ func (t *Translator) Translate(resources *Resources) *TranslateResult { // GetRelevantGateways returns GatewayContexts, containing a copy of the original // Gateway with the Listener statuses reset. -func (t *Translator) GetRelevantGateways(gateways []*gwapiv1.Gateway) []*GatewayContext { +func (t *Translator) GetRelevantGateways(gateways []*gwapiv1b1.Gateway) []*GatewayContext { var relevant []*GatewayContext for _, gateway := range gateways { @@ -274,7 +275,7 @@ func (t *Translator) InitIRs(gateways []*GatewayContext, resources *Resources) ( return xdsIR, infraIR } -func infrastructureAnnotations(gtw *gwapiv1.Gateway) map[string]string { +func infrastructureAnnotations(gtw *gwapiv1b1.Gateway) map[string]string { if gtw.Spec.Infrastructure != nil && len(gtw.Spec.Infrastructure.Annotations) > 0 { res := make(map[string]string) for k, v := range gtw.Spec.Infrastructure.Annotations { @@ -285,7 +286,7 @@ func infrastructureAnnotations(gtw *gwapiv1.Gateway) map[string]string { return nil } -func infrastructureLabels(gtw *gwapiv1.Gateway) map[string]string { +func infrastructureLabels(gtw *gwapiv1b1.Gateway) map[string]string { res := make(map[string]string) if gtw.Spec.Infrastructure != nil { for k, v := range gtw.Spec.Infrastructure.Labels { @@ -296,7 +297,7 @@ func infrastructureLabels(gtw *gwapiv1.Gateway) map[string]string { } // XdsIR and InfraIR map keys by default are {GatewayNamespace}/{GatewayName}, but if mergeGateways is set, they are merged under {GatewayClassName} key. -func (t *Translator) getIRKey(gateway *gwapiv1.Gateway) string { +func (t *Translator) getIRKey(gateway *gwapiv1b1.Gateway) string { irKey := irStringKey(gateway.Namespace, gateway.Name) if t.MergeGateways { return string(t.GatewayClassName) diff --git a/internal/gatewayapi/validate.go b/internal/gatewayapi/validate.go index e7ddb427a157..ec962f8b32f0 100644 --- a/internal/gatewayapi/validate.go +++ b/internal/gatewayapi/validate.go @@ -766,7 +766,7 @@ func (t *Translator) validateHostname(hostname string) error { func (t *Translator) validateSecretRef( allowCrossNamespace bool, from crossNamespaceFrom, - secretObjRef gwapiv1b1.SecretObjectReference, + secretObjRef gwapiv1.SecretObjectReference, resources *Resources) (*v1.Secret, error) { if err := t.validateSecretObjectRef(allowCrossNamespace, from, secretObjRef, resources); err != nil { @@ -790,7 +790,7 @@ func (t *Translator) validateSecretRef( func (t *Translator) validateConfigMapRef( allowCrossNamespace bool, from crossNamespaceFrom, - secretObjRef gwapiv1b1.SecretObjectReference, + secretObjRef gwapiv1.SecretObjectReference, resources *Resources) (*v1.ConfigMap, error) { if err := t.validateSecretObjectRef(allowCrossNamespace, from, secretObjRef, resources); err != nil { @@ -814,7 +814,7 @@ func (t *Translator) validateConfigMapRef( func (t *Translator) validateSecretObjectRef( allowCrossNamespace bool, from crossNamespaceFrom, - secretRef gwapiv1b1.SecretObjectReference, + secretRef gwapiv1.SecretObjectReference, resources *Resources) error { var kind string if secretRef.Group != nil && string(*secretRef.Group) != "" { diff --git a/internal/gatewayapi/zz_generated.deepcopy.go b/internal/gatewayapi/zz_generated.deepcopy.go index 30c6c2938b15..92662adc89a8 100644 --- a/internal/gatewayapi/zz_generated.deepcopy.go +++ b/internal/gatewayapi/zz_generated.deepcopy.go @@ -11,10 +11,9 @@ package gatewayapi import ( apiv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1" - corev1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" discoveryv1 "k8s.io/api/discovery/v1" "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" @@ -25,27 +24,27 @@ func (in *Resources) DeepCopyInto(out *Resources) { *out = *in if in.GatewayClass != nil { in, out := &in.GatewayClass, &out.GatewayClass - *out = new(v1.GatewayClass) + *out = new(v1beta1.GatewayClass) (*in).DeepCopyInto(*out) } if in.Gateways != nil { in, out := &in.Gateways, &out.Gateways - *out = make([]*v1.Gateway, len(*in)) + *out = make([]*v1beta1.Gateway, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(v1.Gateway) + *out = new(v1beta1.Gateway) (*in).DeepCopyInto(*out) } } } if in.HTTPRoutes != nil { in, out := &in.HTTPRoutes, &out.HTTPRoutes - *out = make([]*v1.HTTPRoute, len(*in)) + *out = make([]*v1beta1.HTTPRoute, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(v1.HTTPRoute) + *out = new(v1beta1.HTTPRoute) (*in).DeepCopyInto(*out) } } @@ -107,22 +106,22 @@ func (in *Resources) DeepCopyInto(out *Resources) { } if in.Namespaces != nil { in, out := &in.Namespaces, &out.Namespaces - *out = make([]*corev1.Namespace, len(*in)) + *out = make([]*v1.Namespace, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(corev1.Namespace) + *out = new(v1.Namespace) (*in).DeepCopyInto(*out) } } } if in.Services != nil { in, out := &in.Services, &out.Services - *out = make([]*corev1.Service, len(*in)) + *out = make([]*v1.Service, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(corev1.Service) + *out = new(v1.Service) (*in).DeepCopyInto(*out) } } @@ -151,22 +150,22 @@ func (in *Resources) DeepCopyInto(out *Resources) { } if in.Secrets != nil { in, out := &in.Secrets, &out.Secrets - *out = make([]*corev1.Secret, len(*in)) + *out = make([]*v1.Secret, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(corev1.Secret) + *out = new(v1.Secret) (*in).DeepCopyInto(*out) } } } if in.ConfigMaps != nil { in, out := &in.ConfigMaps, &out.ConfigMaps - *out = make([]*corev1.ConfigMap, len(*in)) + *out = make([]*v1.ConfigMap, len(*in)) for i := range *in { if (*in)[i] != nil { in, out := &(*in)[i], &(*out)[i] - *out = new(corev1.ConfigMap) + *out = new(v1.ConfigMap) (*in).DeepCopyInto(*out) } } diff --git a/internal/kubernetes/secret.go b/internal/kubernetes/secret.go index ff98d61874bd..03fc7e514fdf 100644 --- a/internal/kubernetes/secret.go +++ b/internal/kubernetes/secret.go @@ -10,12 +10,12 @@ import ( "errors" "fmt" + "github.com/envoyproxy/gateway/internal/gatewayapi" + corev1 "k8s.io/api/core/v1" k8smachinery "k8s.io/apimachinery/pkg/types" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - - "github.com/envoyproxy/gateway/internal/gatewayapi" ) // ValidateSecretObjectReference validate secret object reference for extension tls and ratelimit tls settings. diff --git a/internal/message/types.go b/internal/message/types.go index 7fc44da6678b..29953c0da871 100644 --- a/internal/message/types.go +++ b/internal/message/types.go @@ -8,8 +8,8 @@ package message import ( "github.com/telepresenceio/watchable" "k8s.io/apimachinery/pkg/types" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/gatewayapi" @@ -71,8 +71,8 @@ func (p *ProviderResources) Close() { // GatewayAPIStatuses contains gateway API resources statuses type GatewayAPIStatuses struct { - GatewayStatuses watchable.Map[types.NamespacedName, *gwapiv1.GatewayStatus] - HTTPRouteStatuses watchable.Map[types.NamespacedName, *gwapiv1.HTTPRouteStatus] + GatewayStatuses watchable.Map[types.NamespacedName, *gwapiv1b1.GatewayStatus] + HTTPRouteStatuses watchable.Map[types.NamespacedName, *gwapiv1b1.HTTPRouteStatus] GRPCRouteStatuses watchable.Map[types.NamespacedName, *gwapiv1a2.GRPCRouteStatus] TLSRouteStatuses watchable.Map[types.NamespacedName, *gwapiv1a2.TLSRouteStatus] TCPRouteStatuses watchable.Map[types.NamespacedName, *gwapiv1a2.TCPRouteStatus] diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go index b3da2a1f1760..e8f6c2d2d9ca 100644 --- a/internal/provider/kubernetes/controller.go +++ b/internal/provider/kubernetes/controller.go @@ -135,7 +135,7 @@ func newResourceMapping() *resourceMappings { // be handled by a single call to Reconcile. The reconcile.Request DOES NOT map to a specific resource. func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, _ reconcile.Request) (reconcile.Result, error) { var ( - managedGCs []*gwapiv1.GatewayClass + managedGCs []*gwapiv1b1.GatewayClass err error ) r.log.Info("reconciling gateways") @@ -274,8 +274,8 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, _ reconcile.Reques } // managedGatewayClasses returns a list of GatewayClass objects that are managed by the Envoy Gateway Controller. -func (r *gatewayAPIReconciler) managedGatewayClasses(ctx context.Context) ([]*gwapiv1.GatewayClass, error) { - var gatewayClasses gwapiv1.GatewayClassList +func (r *gatewayAPIReconciler) managedGatewayClasses(ctx context.Context) ([]*gwapiv1b1.GatewayClass, error) { + var gatewayClasses gwapiv1b1.GatewayClassList if err := r.client.List(ctx, &gatewayClasses); err != nil { return nil, fmt.Errorf("error listing gatewayclasses: %w", err) } @@ -498,7 +498,7 @@ func (r *gatewayAPIReconciler) processSecretRef( ownerKind string, ownerNS string, ownerName string, - secretRef gwapiv1b1.SecretObjectReference, + secretRef gwapiv1.SecretObjectReference, ) error { secret := new(corev1.Secret) secretNS := gatewayapi.NamespaceDerefOr(secretRef.Namespace, ownerNS) @@ -599,7 +599,7 @@ func (r *gatewayAPIReconciler) processConfigMapRef( ownerKind string, ownerNS string, ownerName string, - configMapRef gwapiv1b1.SecretObjectReference, + configMapRef gwapiv1.SecretObjectReference, ) error { configMap := new(corev1.ConfigMap) configMapNS := gatewayapi.NamespaceDerefOr(configMapRef.Namespace, ownerNS) @@ -690,10 +690,10 @@ func (r *gatewayAPIReconciler) findReferenceGrant(ctx context.Context, from, to return nil, nil } -func (r *gatewayAPIReconciler) processGateways(ctx context.Context, managedGC *gwapiv1.GatewayClass, resourceMap *resourceMappings, resourceTree *gatewayapi.Resources) error { +func (r *gatewayAPIReconciler) processGateways(ctx context.Context, managedGC *gwapiv1b1.GatewayClass, resourceMap *resourceMappings, resourceTree *gatewayapi.Resources) error { // Find gateways for the managedGC // Find the Gateways that reference this Class. - gatewayList := &gwapiv1.GatewayList{} + gatewayList := &gwapiv1b1.GatewayList{} if err := r.client.List(ctx, gatewayList, &client.ListOptions{ FieldSelector: fields.OneTermEqualSelector(classGatewayIndex, managedGC.Name), }); err != nil { @@ -876,7 +876,7 @@ func (r *gatewayAPIReconciler) processBackendTLSPolicies( } // removeFinalizer removes the gatewayclass finalizer from the provided gc, if it exists. -func (r *gatewayAPIReconciler) removeFinalizer(ctx context.Context, gc *gwapiv1.GatewayClass) error { +func (r *gatewayAPIReconciler) removeFinalizer(ctx context.Context, gc *gwapiv1b1.GatewayClass) error { if slice.ContainsString(gc.Finalizers, gatewayClassFinalizer) { base := client.MergeFrom(gc.DeepCopy()) gc.Finalizers = slice.RemoveString(gc.Finalizers, gatewayClassFinalizer) @@ -888,7 +888,7 @@ func (r *gatewayAPIReconciler) removeFinalizer(ctx context.Context, gc *gwapiv1. } // addFinalizer adds the gatewayclass finalizer to the provided gc, if it doesn't exist. -func (r *gatewayAPIReconciler) addFinalizer(ctx context.Context, gc *gwapiv1.GatewayClass) error { +func (r *gatewayAPIReconciler) addFinalizer(ctx context.Context, gc *gwapiv1b1.GatewayClass) error { if !slice.ContainsString(gc.Finalizers, gatewayClassFinalizer) { base := client.MergeFrom(gc.DeepCopy()) gc.Finalizers = append(gc.Finalizers, gatewayClassFinalizer) @@ -902,7 +902,7 @@ func (r *gatewayAPIReconciler) addFinalizer(ctx context.Context, gc *gwapiv1.Gat // watchResources watches gateway api resources. func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.Manager, c controller.Controller) error { if err := c.Watch( - source.Kind(mgr.GetCache(), &gwapiv1.GatewayClass{}), + source.Kind(mgr.GetCache(), &gwapiv1b1.GatewayClass{}), handler.EnqueueRequestsFromMapFunc(r.enqueueClass), predicate.GenerationChangedPredicate{}, predicate.NewPredicateFuncs(r.hasMatchingController), @@ -936,7 +936,7 @@ func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.M gPredicates = append(gPredicates, predicate.NewPredicateFuncs(r.hasMatchingNamespaceLabels)) } if err := c.Watch( - source.Kind(mgr.GetCache(), &gwapiv1.Gateway{}), + source.Kind(mgr.GetCache(), &gwapiv1b1.Gateway{}), handler.EnqueueRequestsFromMapFunc(r.enqueueClass), gPredicates..., ); err != nil { @@ -952,7 +952,7 @@ func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.M httprPredicates = append(httprPredicates, predicate.NewPredicateFuncs(r.hasMatchingNamespaceLabels)) } if err := c.Watch( - source.Kind(mgr.GetCache(), &gwapiv1.HTTPRoute{}), + source.Kind(mgr.GetCache(), &gwapiv1b1.HTTPRoute{}), handler.EnqueueRequestsFromMapFunc(r.enqueueClass), httprPredicates..., ); err != nil { @@ -1274,7 +1274,7 @@ func (r *gatewayAPIReconciler) hasManagedClass(obj client.Object) bool { return false } - gcList := new(gwapiv1.GatewayClassList) + gcList := new(gwapiv1b1.GatewayClassList) err := r.client.List(context.TODO(), gcList) if err != nil { r.log.Error(err, "failed to list gatewayclasses") @@ -1295,7 +1295,7 @@ func (r *gatewayAPIReconciler) hasManagedClass(obj client.Object) bool { } // processParamsRef processes the parametersRef of the provided GatewayClass. -func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1.GatewayClass, resourceTree *gatewayapi.Resources) error { +func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1b1.GatewayClass, resourceTree *gatewayapi.Resources) error { if !refsEnvoyProxy(gc) { return fmt.Errorf("unsupported parametersRef for gatewayclass %s", gc.Name) } @@ -1371,7 +1371,7 @@ func (r *gatewayAPIReconciler) processBackendTLSPolicyConfigMapRefs(ctx context. if tls.CACertRefs != nil { for _, caCertRef := range tls.CACertRefs { if string(caCertRef.Kind) == gatewayapi.KindConfigMap { - caRefNew := gwapiv1b1.SecretObjectReference{ + caRefNew := gwapiv1.SecretObjectReference{ Group: gatewayapi.GroupPtr(string(caCertRef.Group)), Kind: gatewayapi.KindPtr(string(caCertRef.Kind)), Name: caCertRef.Name, diff --git a/internal/provider/kubernetes/controller_test.go b/internal/provider/kubernetes/controller_test.go index 1aa58a1d5339..0bb2e6312033 100644 --- a/internal/provider/kubernetes/controller_test.go +++ b/internal/provider/kubernetes/controller_test.go @@ -15,6 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/envoygateway" @@ -26,12 +27,12 @@ import ( func TestAddGatewayClassFinalizer(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass expect []string }{ { name: "gatewayclass with no finalizers", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -43,7 +44,7 @@ func TestAddGatewayClassFinalizer(t *testing.T) { }, { name: "gatewayclass with a different finalizer", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", Finalizers: []string{"fooFinalizer"}, @@ -56,7 +57,7 @@ func TestAddGatewayClassFinalizer(t *testing.T) { }, { name: "gatewayclass with existing gatewayclass finalizer", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", Finalizers: []string{gatewayClassFinalizer}, @@ -90,12 +91,12 @@ func TestAddGatewayClassFinalizer(t *testing.T) { func TestRemoveGatewayClassFinalizer(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass expect []string }{ { name: "gatewayclass with no finalizers", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -107,7 +108,7 @@ func TestRemoveGatewayClassFinalizer(t *testing.T) { }, { name: "gatewayclass with a different finalizer", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", Finalizers: []string{"fooFinalizer"}, @@ -120,7 +121,7 @@ func TestRemoveGatewayClassFinalizer(t *testing.T) { }, { name: "gatewayclass with existing gatewayclass finalizer", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", Finalizers: []string{gatewayClassFinalizer}, @@ -157,7 +158,7 @@ func TestHasManagedClass(t *testing.T) { testCases := []struct { name string ep client.Object - classes []*gwapiv1.GatewayClass + classes []*gwapiv1b1.GatewayClass expected bool }{ { @@ -168,7 +169,7 @@ func TestHasManagedClass(t *testing.T) { Name: "test-envoyproxy", }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", @@ -202,7 +203,7 @@ func TestHasManagedClass(t *testing.T) { Name: "test-envoyproxy", }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", @@ -236,7 +237,7 @@ func TestHasManagedClass(t *testing.T) { Name: "test-envoyproxy", }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", @@ -254,7 +255,7 @@ func TestHasManagedClass(t *testing.T) { Name: "test-envoyproxy", }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "test-gc1", @@ -341,13 +342,13 @@ func TestProcessParamsRef(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass ep *egv1a1.EnvoyProxy expected bool }{ { name: "valid envoyproxy reference", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -371,7 +372,7 @@ func TestProcessParamsRef(t *testing.T) { }, { name: "envoyproxy kind does not exist", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -389,7 +390,7 @@ func TestProcessParamsRef(t *testing.T) { }, { name: "referenced envoyproxy does not exist", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -413,7 +414,7 @@ func TestProcessParamsRef(t *testing.T) { }, { name: "invalid gatewayclass parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, diff --git a/internal/provider/kubernetes/helpers.go b/internal/provider/kubernetes/helpers.go index 00029f1cb923..1568d48fbb09 100644 --- a/internal/provider/kubernetes/helpers.go +++ b/internal/provider/kubernetes/helpers.go @@ -14,6 +14,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" mcsapi "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" @@ -36,9 +37,9 @@ type ObjectKindNamespacedName struct { // is a Gateway. func validateParentRefs(ctx context.Context, client client.Client, namespace string, gatewayClassController gwapiv1.GatewayController, - routeParentReferences []gwapiv1.ParentReference) ([]gwapiv1.Gateway, error) { + routeParentReferences []gwapiv1.ParentReference) ([]gwapiv1b1.Gateway, error) { - var gateways []gwapiv1.Gateway + var gateways []gwapiv1b1.Gateway for i := range routeParentReferences { ref := routeParentReferences[i] if ref.Kind != nil && *ref.Kind != "Gateway" { @@ -59,13 +60,13 @@ func validateParentRefs(ctx context.Context, client client.Client, namespace str Name: string(ref.Name), } - gw := new(gwapiv1.Gateway) + gw := new(gwapiv1b1.Gateway) if err := client.Get(ctx, gwKey, gw); err != nil { return nil, fmt.Errorf("failed to get gateway %s/%s: %w", gwKey.Namespace, gwKey.Name, err) } gcKey := types.NamespacedName{Name: string(gw.Spec.GatewayClassName)} - gc := new(gwapiv1.GatewayClass) + gc := new(gwapiv1b1.GatewayClass) if err := client.Get(ctx, gcKey, gc); err != nil { return nil, fmt.Errorf("failed to get gatewayclass %s: %w", gcKey.Name, err) } @@ -79,14 +80,14 @@ func validateParentRefs(ctx context.Context, client client.Client, namespace str type controlledClasses struct { // matchedClasses holds all GatewayClass objects with matching controllerName. - matchedClasses []*gwapiv1.GatewayClass + matchedClasses []*gwapiv1b1.GatewayClass } -func (cc *controlledClasses) addMatch(gc *gwapiv1.GatewayClass) { +func (cc *controlledClasses) addMatch(gc *gwapiv1b1.GatewayClass) { cc.matchedClasses = append(cc.matchedClasses, gc) } -func (cc *controlledClasses) removeMatch(gc *gwapiv1.GatewayClass) { +func (cc *controlledClasses) removeMatch(gc *gwapiv1b1.GatewayClass) { // First remove gc from matchedClasses. for i, matchedGC := range cc.matchedClasses { if matchedGC.Name == gc.Name { @@ -99,7 +100,7 @@ func (cc *controlledClasses) removeMatch(gc *gwapiv1.GatewayClass) { // isAccepted returns true if the provided gatewayclass contains the Accepted=true // status condition. -func isAccepted(gc *gwapiv1.GatewayClass) bool { +func isAccepted(gc *gwapiv1b1.GatewayClass) bool { if gc == nil { return false } @@ -112,8 +113,8 @@ func isAccepted(gc *gwapiv1.GatewayClass) bool { } // gatewaysOfClass returns a list of gateways that reference gc from the provided gwList. -func gatewaysOfClass(gc *gwapiv1.GatewayClass, gwList *gwapiv1.GatewayList) []gwapiv1.Gateway { - var gateways []gwapiv1.Gateway +func gatewaysOfClass(gc *gwapiv1b1.GatewayClass, gwList *gwapiv1b1.GatewayList) []gwapiv1b1.Gateway { + var gateways []gwapiv1b1.Gateway if gwList == nil || gc == nil { return gateways } @@ -148,7 +149,7 @@ func refsSecret(ref *gwapiv1.SecretObjectReference) bool { // infraName returns expected name for the EnvoyProxy infra resources. // By default it returns hashed string from {GatewayNamespace}/{GatewayName}, // but if mergeGateways is set, it will return hashed string of {GatewayClassName}. -func infraName(gateway *gwapiv1.Gateway, merged bool) string { +func infraName(gateway *gwapiv1b1.Gateway, merged bool) string { if merged { return proxy.ExpectedResourceHashedName(string(gateway.Spec.GatewayClassName)) } @@ -176,7 +177,7 @@ func validateBackendRef(ref *gwapiv1.BackendRef) error { } // classRefsEnvoyProxy returns true if the provided GatewayClass references the provided EnvoyProxy. -func classRefsEnvoyProxy(gc *gwapiv1.GatewayClass, ep *egv1a1.EnvoyProxy) bool { +func classRefsEnvoyProxy(gc *gwapiv1b1.GatewayClass, ep *egv1a1.EnvoyProxy) bool { if gc == nil || ep == nil { return false } @@ -187,7 +188,7 @@ func classRefsEnvoyProxy(gc *gwapiv1.GatewayClass, ep *egv1a1.EnvoyProxy) bool { } // refsEnvoyProxy returns true if the provided GatewayClass references an EnvoyProxy. -func refsEnvoyProxy(gc *gwapiv1.GatewayClass) bool { +func refsEnvoyProxy(gc *gwapiv1b1.GatewayClass) bool { if gc == nil { return false } @@ -200,7 +201,7 @@ func refsEnvoyProxy(gc *gwapiv1.GatewayClass) bool { } // classAccepted returns true if the provided GatewayClass is accepted. -func classAccepted(gc *gwapiv1.GatewayClass) bool { +func classAccepted(gc *gwapiv1b1.GatewayClass) bool { if gc == nil { return false } diff --git a/internal/provider/kubernetes/helpers_test.go b/internal/provider/kubernetes/helpers_test.go index 0d5deb0d5d3a..e9eafdd7d009 100644 --- a/internal/provider/kubernetes/helpers_test.go +++ b/internal/provider/kubernetes/helpers_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/envoygateway/config" @@ -18,19 +19,19 @@ import ( ) func TestGatewaysOfClass(t *testing.T) { - gc := &gwapiv1.GatewayClass{ + gc := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, } testCases := []struct { name string - gws []gwapiv1.Gateway + gws []gwapiv1b1.Gateway expect int }{ { name: "no matching gateways", - gws: []gwapiv1.Gateway{ + gws: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Name: "test", @@ -54,7 +55,7 @@ func TestGatewaysOfClass(t *testing.T) { }, { name: "one of two matching gateways", - gws: []gwapiv1.Gateway{ + gws: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Name: "test", @@ -78,7 +79,7 @@ func TestGatewaysOfClass(t *testing.T) { }, { name: "two of two matching gateways", - gws: []gwapiv1.Gateway{ + gws: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Name: "test", @@ -105,7 +106,7 @@ func TestGatewaysOfClass(t *testing.T) { for _, tc := range testCases { tc := tc t.Run(tc.name, func(t *testing.T) { - gwList := &gwapiv1.GatewayList{Items: tc.gws} + gwList := &gwapiv1b1.GatewayList{Items: tc.gws} actual := gatewaysOfClass(gc, gwList) require.Len(t, actual, tc.expect) }) @@ -115,12 +116,12 @@ func TestGatewaysOfClass(t *testing.T) { func TestIsGatewayClassAccepted(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass expect bool }{ { name: "gatewayclass accepted condition", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -140,7 +141,7 @@ func TestIsGatewayClassAccepted(t *testing.T) { }, { name: "gatewayclass not accepted condition", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -160,7 +161,7 @@ func TestIsGatewayClassAccepted(t *testing.T) { }, { name: "no gatewayclass accepted condition type", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -196,7 +197,7 @@ func TestIsGatewayClassAccepted(t *testing.T) { func TestRefsEnvoyProxy(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass expect bool }{ { @@ -206,7 +207,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "valid envoyproxy parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -225,7 +226,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "unspecified parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -238,7 +239,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "unsupported group parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -257,7 +258,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "unsupported group parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -276,7 +277,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "unsupported group parameters ref", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -295,7 +296,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "empty parameters ref name", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -314,7 +315,7 @@ func TestRefsEnvoyProxy(t *testing.T) { }, { name: "unspecified parameters ref namespace", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", Namespace: "test", @@ -346,7 +347,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass ep *egv1a1.EnvoyProxy expected bool }{ @@ -358,7 +359,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { }, { name: "gatewayclass references envoyproxy", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -382,7 +383,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { }, { name: "gatewayclass does not reference envoyproxy", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -406,7 +407,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { }, { name: "gatewayclass references invalid kind", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -430,7 +431,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { }, { name: "gatewayclass references invalid group", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -454,7 +455,7 @@ func TestClassRefsEnvoyProxy(t *testing.T) { }, { name: "gatewayclass references envoyproxy without namespace", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -494,7 +495,7 @@ func TestClassAccepted(t *testing.T) { testCases := []struct { name string - gc *gwapiv1.GatewayClass + gc *gwapiv1b1.GatewayClass expected bool }{ { @@ -504,7 +505,7 @@ func TestClassAccepted(t *testing.T) { }, { name: "gatewayclass accepted", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, @@ -524,7 +525,7 @@ func TestClassAccepted(t *testing.T) { }, { name: "gatewayclass not accepted", - gc: &gwapiv1.GatewayClass{ + gc: &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test-gc", }, diff --git a/internal/provider/kubernetes/indexers.go b/internal/provider/kubernetes/indexers.go index 3e638a17aae8..50709bed9446 100644 --- a/internal/provider/kubernetes/indexers.go +++ b/internal/provider/kubernetes/indexers.go @@ -58,11 +58,11 @@ func addReferenceGrantIndexers(ctx context.Context, mgr manager.Manager) error { // - For Service, ServiceImports objects that are referenced in HTTPRoute objects via `.spec.rules.backendRefs`. // This helps in querying for HTTPRoutes that are affected by a particular Service CRUD. func addHTTPRouteIndexers(ctx context.Context, mgr manager.Manager) error { - if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1.HTTPRoute{}, gatewayHTTPRouteIndex, gatewayHTTPRouteIndexFunc); err != nil { + if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1b1.HTTPRoute{}, gatewayHTTPRouteIndex, gatewayHTTPRouteIndexFunc); err != nil { return err } - if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc); err != nil { + if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1b1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc); err != nil { return err } @@ -70,7 +70,7 @@ func addHTTPRouteIndexers(ctx context.Context, mgr manager.Manager) error { } func gatewayHTTPRouteIndexFunc(rawObj client.Object) []string { - httproute := rawObj.(*gwapiv1.HTTPRoute) + httproute := rawObj.(*gwapiv1b1.HTTPRoute) var gateways []string for _, parent := range httproute.Spec.ParentRefs { if parent.Kind == nil || string(*parent.Kind) == gatewayapi.KindGateway { @@ -88,7 +88,7 @@ func gatewayHTTPRouteIndexFunc(rawObj client.Object) []string { } func backendHTTPRouteIndexFunc(rawObj client.Object) []string { - httproute := rawObj.(*gwapiv1.HTTPRoute) + httproute := rawObj.(*gwapiv1b1.HTTPRoute) var backendRefs []string for _, rule := range httproute.Spec.Rules { for _, backend := range rule.BackendRefs { @@ -316,12 +316,12 @@ func backendUDPRouteIndexFunc(rawObj client.Object) []string { // referenced in Gateway objects. This helps in querying for Gateways that are // affected by a particular Secret CRUD. func addGatewayIndexers(ctx context.Context, mgr manager.Manager) error { - if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1.Gateway{}, secretGatewayIndex, secretGatewayIndexFunc); err != nil { + if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1b1.Gateway{}, secretGatewayIndex, secretGatewayIndexFunc); err != nil { return err } - if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1.Gateway{}, classGatewayIndex, func(rawObj client.Object) []string { - gateway := rawObj.(*gwapiv1.Gateway) + if err := mgr.GetFieldIndexer().IndexField(ctx, &gwapiv1b1.Gateway{}, classGatewayIndex, func(rawObj client.Object) []string { + gateway := rawObj.(*gwapiv1b1.Gateway) return []string{string(gateway.Spec.GatewayClassName)} }); err != nil { return err @@ -330,7 +330,7 @@ func addGatewayIndexers(ctx context.Context, mgr manager.Manager) error { } func secretGatewayIndexFunc(rawObj client.Object) []string { - gateway := rawObj.(*gwapiv1.Gateway) + gateway := rawObj.(*gwapiv1b1.Gateway) var secretReferences []string for _, listener := range gateway.Spec.Listeners { if listener.TLS == nil || *listener.TLS.Mode != gwapiv1.TLSModeTerminate { @@ -381,7 +381,7 @@ func secretSecurityPolicyIndexFunc(rawObj client.Object) []string { securityPolicy := rawObj.(*v1alpha1.SecurityPolicy) var ( - secretReferences []gwapiv1b1.SecretObjectReference + secretReferences []gwapiv1.SecretObjectReference values []string ) diff --git a/internal/provider/kubernetes/kubernetes_test.go b/internal/provider/kubernetes/kubernetes_test.go index 350818cb1823..af00f51075ae 100644 --- a/internal/provider/kubernetes/kubernetes_test.go +++ b/internal/provider/kubernetes/kubernetes_test.go @@ -31,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/envoygateway/config" @@ -248,7 +249,7 @@ func testGatewayScheduledStatus(ctx context.Context, t *testing.T, provider *Pro ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test-gw-of-class"}} require.NoError(t, cli.Create(ctx, ns)) - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: "scheduled-status-test", Namespace: ns.Name, @@ -405,7 +406,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "httproute-test"}} require.NoError(t, cli.Create(ctx, ns)) - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-test", Namespace: ns.Name, @@ -446,11 +447,11 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour var testCases = []struct { name string - route gwapiv1.HTTPRoute + route gwapiv1b1.HTTPRoute }{ { name: "destination-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-test", Namespace: ns.Name, @@ -491,7 +492,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "redirect-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-redirect-test", Namespace: ns.Name, @@ -537,7 +538,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "rewrite-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-rewrite-test", Namespace: ns.Name, @@ -590,7 +591,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "add-request-header-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-add-request-header-test", Namespace: ns.Name, @@ -654,7 +655,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "remove-request-header-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-remove-request-header-test", Namespace: ns.Name, @@ -707,7 +708,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "add-response-header-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-add-response-header-test", Namespace: ns.Name, @@ -771,7 +772,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "remove-response-header-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-remove-response-header-test", Namespace: ns.Name, @@ -824,7 +825,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour }, { name: "mirror-httproute", - route: gwapiv1.HTTPRoute{ + route: gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-mirror-test", Namespace: ns.Name, @@ -955,7 +956,7 @@ func testTLSRoute(ctx context.Context, t *testing.T, provider *Provider, resourc ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tlsroute-test"}} require.NoError(t, cli.Create(ctx, ns)) - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: "tlsroute-test", Namespace: ns.Name, @@ -1101,7 +1102,7 @@ func testServiceCleanupForMultipleRoutes(ctx context.Context, t *testing.T, prov ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "service-cleanup-test"}} require.NoError(t, cli.Create(ctx, ns)) - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Name: "service-cleanup-test", Namespace: ns.Name, @@ -1162,7 +1163,7 @@ func testServiceCleanupForMultipleRoutes(ctx context.Context, t *testing.T, prov }, } - httpRoute := gwapiv1.HTTPRoute{ + httpRoute := gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Name: "httproute-test", Namespace: ns.Name, @@ -1295,7 +1296,7 @@ func TestNamespacedProvider(t *testing.T) { require.NoError(t, cli.Create(ctx, gw3)) // Ensure only 2 gateways are reconciled - gatewayList := &gwapiv1.GatewayList{} + gatewayList := &gwapiv1b1.GatewayList{} require.NoError(t, cli.List(ctx, gatewayList)) assert.Equal(t, len(gatewayList.Items), 2) diff --git a/internal/provider/kubernetes/predicates.go b/internal/provider/kubernetes/predicates.go index 3585a2913aeb..262fde67efce 100644 --- a/internal/provider/kubernetes/predicates.go +++ b/internal/provider/kubernetes/predicates.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - 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" @@ -34,7 +34,7 @@ const oidcHMACSecretName = "envoy-oidc-hmac" // with a Spec.Controller string matching this Envoy Gateway's controller string, // or false otherwise. func (r *gatewayAPIReconciler) hasMatchingController(obj client.Object) bool { - gc, ok := obj.(*gwapiv1.GatewayClass) + gc, ok := obj.(*gwapiv1b1.GatewayClass) if !ok { r.log.Info("bypassing reconciliation due to unexpected object type", "type", obj) return false @@ -111,13 +111,13 @@ func matchLabelsAndExpressions(ls *metav1.LabelSelector, objLabels map[string]st // validateGatewayForReconcile returns true if the provided object is a Gateway // using a GatewayClass matching the configured gatewayclass controller name. func (r *gatewayAPIReconciler) validateGatewayForReconcile(obj client.Object) bool { - gw, ok := obj.(*gwapiv1.Gateway) + gw, ok := obj.(*gwapiv1b1.Gateway) if !ok { r.log.Info("unexpected object type, bypassing reconciliation", "object", obj) return false } - gc := &gwapiv1.GatewayClass{} + gc := &gwapiv1b1.GatewayClass{} key := types.NamespacedName{Name: string(gw.Spec.GatewayClassName)} if err := r.client.Get(context.Background(), key, gc); err != nil { r.log.Error(err, "failed to get gatewayclass", "name", gw.Spec.GatewayClassName) @@ -164,7 +164,7 @@ func (r *gatewayAPIReconciler) validateSecretForReconcile(obj client.Object) boo } func (r *gatewayAPIReconciler) isGatewayReferencingSecret(nsName *types.NamespacedName) bool { - gwList := &gwapiv1.GatewayList{} + gwList := &gwapiv1b1.GatewayList{} if err := r.client.List(context.Background(), gwList, &client.ListOptions{ FieldSelector: fields.OneTermEqualSelector(secretGatewayIndex, nsName.String()), }); err != nil { @@ -284,7 +284,7 @@ func (r *gatewayAPIReconciler) validateServiceImportForReconcile(obj client.Obje // in the system, else returns false. func (r *gatewayAPIReconciler) isRouteReferencingBackend(nsName *types.NamespacedName) bool { ctx := context.Background() - httpRouteList := &gwapiv1.HTTPRouteList{} + httpRouteList := &gwapiv1b1.HTTPRouteList{} if err := r.client.List(ctx, httpRouteList, &client.ListOptions{ FieldSelector: fields.OneTermEqualSelector(backendHTTPRouteIndex, nsName.String()), }); err != nil { @@ -403,7 +403,7 @@ func (r *gatewayAPIReconciler) validateDeploymentForReconcile(obj client.Object) } // envoyDeploymentForGateway returns the Envoy Deployment, returning nil if the Deployment doesn't exist. -func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, gateway *gwapiv1.Gateway) (*appsv1.Deployment, error) { +func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, gateway *gwapiv1b1.Gateway) (*appsv1.Deployment, error) { key := types.NamespacedName{ Namespace: r.namespace, Name: infraName(gateway, r.mergeGateways.Has(string(gateway.Spec.GatewayClassName))), @@ -419,7 +419,7 @@ func (r *gatewayAPIReconciler) envoyDeploymentForGateway(ctx context.Context, ga } // envoyServiceForGateway returns the Envoy service, returning nil if the service doesn't exist. -func (r *gatewayAPIReconciler) envoyServiceForGateway(ctx context.Context, gateway *gwapiv1.Gateway) (*corev1.Service, error) { +func (r *gatewayAPIReconciler) envoyServiceForGateway(ctx context.Context, gateway *gwapiv1b1.Gateway) (*corev1.Service, error) { key := types.NamespacedName{ Namespace: r.namespace, Name: infraName(gateway, r.mergeGateways.Has(string(gateway.Spec.GatewayClassName))), @@ -435,7 +435,7 @@ func (r *gatewayAPIReconciler) envoyServiceForGateway(ctx context.Context, gatew } // findOwningGateway attempts finds a Gateway using "labels". -func (r *gatewayAPIReconciler) findOwningGateway(ctx context.Context, labels map[string]string) *gwapiv1.Gateway { +func (r *gatewayAPIReconciler) findOwningGateway(ctx context.Context, labels map[string]string) *gwapiv1b1.Gateway { gwName, ok := labels[gatewayapi.OwningGatewayNameLabel] if !ok { return nil @@ -447,7 +447,7 @@ func (r *gatewayAPIReconciler) findOwningGateway(ctx context.Context, labels map } gatewayKey := types.NamespacedName{Namespace: gwNamespace, Name: gwName} - gtw := new(gwapiv1.Gateway) + gtw := new(gwapiv1b1.Gateway) if err := r.client.Get(ctx, gatewayKey, gtw); err != nil { r.log.Info("gateway not found", "namespace", gtw.Namespace, "name", gtw.Name) return nil @@ -458,7 +458,7 @@ func (r *gatewayAPIReconciler) findOwningGateway(ctx context.Context, labels map // updateStatusForGatewaysUnderGatewayClass updates status of all Gateways under the GatewayClass. func (r *gatewayAPIReconciler) updateStatusForGatewaysUnderGatewayClass(ctx context.Context, gatewayClassName string) error { - gateways := new(gwapiv1.GatewayList) + gateways := new(gwapiv1b1.GatewayList) if err := r.client.List(ctx, gateways, &client.ListOptions{ FieldSelector: fields.OneTermEqualSelector(classGatewayIndex, gatewayClassName), }); err != nil { diff --git a/internal/provider/kubernetes/predicates_test.go b/internal/provider/kubernetes/predicates_test.go index f923eef8a260..f69382a2e16d 100644 --- a/internal/provider/kubernetes/predicates_test.go +++ b/internal/provider/kubernetes/predicates_test.go @@ -296,7 +296,7 @@ func TestValidateSecretForReconcile(t *testing.T) { r.client = fakeclient.NewClientBuilder(). WithScheme(envoygateway.GetScheme()). WithObjects(tc.configs...). - WithIndex(&gwapiv1.Gateway{}, secretGatewayIndex, secretGatewayIndexFunc). + WithIndex(&gwapiv1b1.Gateway{}, secretGatewayIndex, secretGatewayIndexFunc). WithIndex(&v1alpha1.SecurityPolicy{}, secretSecurityPolicyIndex, secretSecurityPolicyIndexFunc). Build() t.Run(tc.name, func(t *testing.T) { @@ -361,7 +361,7 @@ func TestValidateEndpointSliceForReconcile(t *testing.T) { r.client = fakeclient.NewClientBuilder(). WithScheme(envoygateway.GetScheme()). WithObjects(tc.configs...). - WithIndex(&gwapiv1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc). + WithIndex(&gwapiv1b1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc). WithIndex(&gwapiv1a2.GRPCRoute{}, backendGRPCRouteIndex, backendGRPCRouteIndexFunc). WithIndex(&gwapiv1a2.TLSRoute{}, backendTLSRouteIndex, backendTLSRouteIndexFunc). WithIndex(&gwapiv1a2.TCPRoute{}, backendTCPRouteIndex, backendTCPRouteIndexFunc). @@ -565,7 +565,7 @@ func TestValidateServiceForReconcile(t *testing.T) { r.client = fakeclient.NewClientBuilder(). WithScheme(envoygateway.GetScheme()). WithObjects(tc.configs...). - WithIndex(&gwapiv1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc). + WithIndex(&gwapiv1b1.HTTPRoute{}, backendHTTPRouteIndex, backendHTTPRouteIndexFunc). WithIndex(&gwapiv1a2.GRPCRoute{}, backendGRPCRouteIndex, backendGRPCRouteIndexFunc). WithIndex(&gwapiv1a2.TLSRoute{}, backendTLSRouteIndex, backendTLSRouteIndexFunc). WithIndex(&gwapiv1a2.TCPRoute{}, backendTCPRouteIndex, backendTCPRouteIndexFunc). diff --git a/internal/provider/kubernetes/routes.go b/internal/provider/kubernetes/routes.go index 20d690f574ab..bc909546a8da 100644 --- a/internal/provider/kubernetes/routes.go +++ b/internal/provider/kubernetes/routes.go @@ -15,6 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" "github.com/envoyproxy/gateway/internal/gatewayapi" "github.com/envoyproxy/gateway/internal/utils" @@ -204,7 +205,7 @@ func (r *gatewayAPIReconciler) processGRPCRoutes(ctx context.Context, gatewayNam // the backend references and pushes the HTTPRoutes to the resourceTree. func (r *gatewayAPIReconciler) processHTTPRoutes(ctx context.Context, gatewayNamespaceName string, resourceMap *resourceMappings, resourceTree *gatewayapi.Resources) error { - httpRouteList := &gwapiv1.HTTPRouteList{} + httpRouteList := &gwapiv1b1.HTTPRouteList{} extensionRefFilters, err := r.getExtensionRefFilters(ctx) if err != nil { diff --git a/internal/provider/kubernetes/routes_test.go b/internal/provider/kubernetes/routes_test.go index 5b31a04db8f3..58f172240578 100644 --- a/internal/provider/kubernetes/routes_test.go +++ b/internal/provider/kubernetes/routes_test.go @@ -22,6 +22,7 @@ import ( fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/envoygateway" @@ -38,7 +39,7 @@ func TestProcessHTTPRoutes(t *testing.T) { // The gatewayclass configured for the reconciler and referenced by test cases. gcCtrlName := gwapiv1.GatewayController(egv1a1.GatewayControllerName) - gc := &gwapiv1.GatewayClass{ + gc := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -48,7 +49,7 @@ func TestProcessHTTPRoutes(t *testing.T) { } // The gateway referenced by test cases. - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -72,14 +73,14 @@ func TestProcessHTTPRoutes(t *testing.T) { testCases := []struct { name string - routes []*gwapiv1.HTTPRoute + routes []*gwapiv1b1.HTTPRoute extensionFilters []*unstructured.Unstructured extensionAPIGroups []schema.GroupVersionKind expected bool }{ { name: "valid httproute", - routes: []*gwapiv1.HTTPRoute{ + routes: []*gwapiv1b1.HTTPRoute{ { ObjectMeta: metav1.ObjectMeta{ Namespace: httpRouteNS, @@ -123,7 +124,7 @@ func TestProcessHTTPRoutes(t *testing.T) { }, { name: "httproute with one filter_from_extension", - routes: []*gwapiv1.HTTPRoute{ + routes: []*gwapiv1b1.HTTPRoute{ { ObjectMeta: metav1.ObjectMeta{ Namespace: httpRouteNS, @@ -196,7 +197,7 @@ func TestProcessHTTPRoutes(t *testing.T) { }, { name: "httproute with invalid timeout setting for HTTPRouteRule", - routes: []*gwapiv1.HTTPRoute{ + routes: []*gwapiv1b1.HTTPRoute{ { ObjectMeta: metav1.ObjectMeta{ Namespace: httpRouteNS, @@ -274,12 +275,12 @@ func TestProcessHTTPRoutes(t *testing.T) { r.client = fakeclient.NewClientBuilder(). WithScheme(envoygateway.GetScheme()). WithObjects(objs...). - WithIndex(&gwapiv1.HTTPRoute{}, gatewayHTTPRouteIndex, gatewayHTTPRouteIndexFunc). + WithIndex(&gwapiv1b1.HTTPRoute{}, gatewayHTTPRouteIndex, gatewayHTTPRouteIndexFunc). Build() // Wait until all the httproutes have been initialized. require.Eventually(t, func() bool { - httpRoutes := gwapiv1.HTTPRouteList{} + httpRoutes := gwapiv1b1.HTTPRouteList{} if err := r.client.List(ctx, &httpRoutes, client.InNamespace(httpRouteNS)); err != nil { return false } @@ -313,7 +314,7 @@ func TestProcessHTTPRoutes(t *testing.T) { func TestProcessGRPCRoutes(t *testing.T) { // The gatewayclass configured for the reconciler and referenced by test cases. gcCtrlName := gwapiv1.GatewayController(egv1a1.GatewayControllerName) - gc := &gwapiv1.GatewayClass{ + gc := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: "test", }, @@ -323,7 +324,7 @@ func TestProcessGRPCRoutes(t *testing.T) { } // The gateway referenced by test cases. - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -440,15 +441,15 @@ func TestProcessGRPCRoutes(t *testing.T) { func TestValidateHTTPRouteParentRefs(t *testing.T) { testCases := []struct { name string - route *gwapiv1.HTTPRoute - gateways []*gwapiv1.Gateway - classes []*gwapiv1.GatewayClass - expect []gwapiv1.Gateway + route *gwapiv1b1.HTTPRoute + gateways []*gwapiv1b1.Gateway + classes []*gwapiv1b1.GatewayClass + expect []gwapiv1b1.Gateway expected bool }{ { name: "valid parentRef", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -465,7 +466,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - gateways: []*gwapiv1.Gateway{ + gateways: []*gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -476,7 +477,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc1", @@ -486,7 +487,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - expect: []gwapiv1.Gateway{ + expect: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -502,7 +503,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "invalid parentRef group", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -523,7 +524,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "invalid parentRef kind", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -544,7 +545,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "non-existent parentRef name", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -565,7 +566,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "valid parentRefs", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -587,7 +588,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - gateways: []*gwapiv1.Gateway{ + gateways: []*gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -607,7 +608,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc1", @@ -617,7 +618,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - expect: []gwapiv1.Gateway{ + expect: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -643,7 +644,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "one of two parentRefs are managed", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -665,7 +666,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - gateways: []*gwapiv1.Gateway{ + gateways: []*gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -685,7 +686,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - classes: []*gwapiv1.GatewayClass{ + classes: []*gwapiv1b1.GatewayClass{ { ObjectMeta: metav1.ObjectMeta{ Name: "gc1", @@ -703,7 +704,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, }, }, - expect: []gwapiv1.Gateway{ + expect: []gwapiv1b1.Gateway{ { ObjectMeta: metav1.ObjectMeta{ Namespace: "test", @@ -719,7 +720,7 @@ func TestValidateHTTPRouteParentRefs(t *testing.T) { }, { name: "one of two valid parentRefs kind", - route: &gwapiv1.HTTPRoute{ + route: &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", diff --git a/internal/provider/kubernetes/status.go b/internal/provider/kubernetes/status.go index e9b838b68815..911aee0392fb 100644 --- a/internal/provider/kubernetes/status.go +++ b/internal/provider/kubernetes/status.go @@ -12,8 +12,8 @@ import ( kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/internal/message" @@ -29,13 +29,13 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) { message.HandleSubscription( message.Metadata{Runner: string(v1alpha1.LogComponentProviderRunner), Message: "gateway-status"}, r.resources.GatewayStatuses.Subscribe(ctx), - func(update message.Update[types.NamespacedName, *gwapiv1.GatewayStatus], errChan chan error) { + func(update message.Update[types.NamespacedName, *gwapiv1b1.GatewayStatus], errChan chan error) { // skip delete updates. if update.Delete { return } // Get gateway object - gtw := new(gwapiv1.Gateway) + gtw := new(gwapiv1b1.Gateway) if err := r.client.Get(ctx, update.Key, gtw); err != nil { r.log.Error(err, "gateway not found", "namespace", gtw.Namespace, "name", gtw.Name) errChan <- err @@ -54,7 +54,7 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) { message.HandleSubscription( message.Metadata{Runner: string(v1alpha1.LogComponentProviderRunner), Message: "httproute-status"}, r.resources.HTTPRouteStatuses.Subscribe(ctx), - func(update message.Update[types.NamespacedName, *gwapiv1.HTTPRouteStatus], errChan chan error) { + func(update message.Update[types.NamespacedName, *gwapiv1b1.HTTPRouteStatus], errChan chan error) { // skip delete updates. if update.Delete { return @@ -63,9 +63,9 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) { val := update.Value r.statusUpdater.Send(status.Update{ NamespacedName: key, - Resource: new(gwapiv1.HTTPRoute), + Resource: new(gwapiv1b1.HTTPRoute), Mutator: status.MutatorFunc(func(obj client.Object) client.Object { - h, ok := obj.(*gwapiv1.HTTPRoute) + h, ok := obj.(*gwapiv1b1.HTTPRoute) if !ok { err := fmt.Errorf("unsupported object type %T", obj) errChan <- err @@ -366,7 +366,7 @@ func (r *gatewayAPIReconciler) subscribeAndUpdateStatus(ctx context.Context) { }() } -func (r *gatewayAPIReconciler) updateStatusForGateway(ctx context.Context, gtw *gwapiv1.Gateway) { +func (r *gatewayAPIReconciler) updateStatusForGateway(ctx context.Context, gtw *gwapiv1b1.Gateway) { // nil check for unit tests. if r.statusUpdater == nil { return @@ -395,9 +395,9 @@ func (r *gatewayAPIReconciler) updateStatusForGateway(ctx context.Context, gtw * // publish status r.statusUpdater.Send(status.Update{ NamespacedName: key, - Resource: new(gwapiv1.Gateway), + Resource: new(gwapiv1b1.Gateway), Mutator: status.MutatorFunc(func(obj client.Object) client.Object { - g, ok := obj.(*gwapiv1.Gateway) + g, ok := obj.(*gwapiv1b1.Gateway) if !ok { panic(fmt.Sprintf("unsupported object type %T", obj)) } @@ -412,16 +412,16 @@ func (r *gatewayAPIReconciler) updateStatusForGateway(ctx context.Context, gtw * func (r *gatewayAPIReconciler) updateStatusForGatewayClass( ctx context.Context, - gc *gwapiv1.GatewayClass, + gc *gwapiv1b1.GatewayClass, accepted bool, reason, msg string) error { if r.statusUpdater != nil { r.statusUpdater.Send(status.Update{ NamespacedName: types.NamespacedName{Name: gc.Name}, - Resource: &gwapiv1.GatewayClass{}, + Resource: &gwapiv1b1.GatewayClass{}, Mutator: status.MutatorFunc(func(obj client.Object) client.Object { - gc, ok := obj.(*gwapiv1.GatewayClass) + gc, ok := obj.(*gwapiv1b1.GatewayClass) if !ok { panic(fmt.Sprintf("unsupported object type %T", obj)) } diff --git a/internal/provider/kubernetes/test/utils.go b/internal/provider/kubernetes/test/utils.go index a221d067f203..b06eb19552a3 100644 --- a/internal/provider/kubernetes/test/utils.go +++ b/internal/provider/kubernetes/test/utils.go @@ -14,6 +14,7 @@ import ( "k8s.io/utils/ptr" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" ) @@ -39,8 +40,8 @@ func GetEnvoyProxy(nsName types.NamespacedName, mergeGateways bool) *egv1a1.Envo } // GetGatewayClass returns a sample GatewayClass. -func GetGatewayClass(name string, controller gwapiv1.GatewayController, envoyProxy *GroupKindNamespacedName) *gwapiv1.GatewayClass { - gwc := &gwapiv1.GatewayClass{ +func GetGatewayClass(name string, controller gwapiv1b1.GatewayController, envoyProxy *GroupKindNamespacedName) *gwapiv1b1.GatewayClass { + gwc := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, @@ -62,8 +63,8 @@ func GetGatewayClass(name string, controller gwapiv1.GatewayController, envoyPro } // GetGateway returns a sample Gateway with single listener. -func GetGateway(nsName types.NamespacedName, gwclass string, listenerPort int32) *gwapiv1.Gateway { - return &gwapiv1.Gateway{ +func GetGateway(nsName types.NamespacedName, gwclass string, listenerPort int32) *gwapiv1b1.Gateway { + return &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: nsName.Namespace, Name: nsName.Name, @@ -82,7 +83,7 @@ func GetGateway(nsName types.NamespacedName, gwclass string, listenerPort int32) } // GetSecureGateway returns a sample Gateway with single TLS listener. -func GetSecureGateway(nsName types.NamespacedName, gwclass string, secretKindNSName GroupKindNamespacedName) *gwapiv1.Gateway { +func GetSecureGateway(nsName types.NamespacedName, gwclass string, secretKindNSName GroupKindNamespacedName) *gwapiv1b1.Gateway { secureGateway := GetGateway(nsName, gwclass, 8080) secureGateway.Spec.Listeners[0].TLS = &gwapiv1.GatewayTLSConfig{ Mode: ptr.To(gwapiv1.TLSModeTerminate), @@ -107,8 +108,8 @@ func GetSecret(nsName types.NamespacedName) *corev1.Secret { } // GetHTTPRoute returns a sample HTTPRoute with a parent reference. -func GetHTTPRoute(nsName types.NamespacedName, parent string, serviceName types.NamespacedName, port int32) *gwapiv1.HTTPRoute { - return &gwapiv1.HTTPRoute{ +func GetHTTPRoute(nsName types.NamespacedName, parent string, serviceName types.NamespacedName, port int32) *gwapiv1b1.HTTPRoute { + return &gwapiv1b1.HTTPRoute{ ObjectMeta: metav1.ObjectMeta{ Namespace: nsName.Namespace, Name: nsName.Name, diff --git a/internal/status/conditions.go b/internal/status/conditions.go index 092513184bb0..9101360a6064 100644 --- a/internal/status/conditions.go +++ b/internal/status/conditions.go @@ -21,6 +21,7 @@ import ( appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) const ( @@ -32,7 +33,7 @@ const ( ) // computeGatewayClassAcceptedCondition computes the GatewayClass Accepted status condition. -func computeGatewayClassAcceptedCondition(gatewayClass *gwapiv1.GatewayClass, +func computeGatewayClassAcceptedCondition(gatewayClass *gwapiv1b1.GatewayClass, accepted bool, reason, msg string) metav1.Condition { switch accepted { @@ -58,7 +59,7 @@ func computeGatewayClassAcceptedCondition(gatewayClass *gwapiv1.GatewayClass, } // computeGatewayAcceptedCondition computes the Gateway Accepted status condition. -func computeGatewayAcceptedCondition(gw *gwapiv1.Gateway, accepted bool) metav1.Condition { +func computeGatewayAcceptedCondition(gw *gwapiv1b1.Gateway, accepted bool) metav1.Condition { switch accepted { case true: return newCondition(string(gwapiv1.GatewayReasonAccepted), metav1.ConditionTrue, @@ -73,7 +74,7 @@ func computeGatewayAcceptedCondition(gw *gwapiv1.Gateway, accepted bool) metav1. // computeGatewayProgrammedCondition computes the Gateway Programmed status condition. // Programmed condition surfaces true when the Envoy Deployment status is ready. -func computeGatewayProgrammedCondition(gw *gwapiv1.Gateway, deployment *appsv1.Deployment) metav1.Condition { +func computeGatewayProgrammedCondition(gw *gwapiv1b1.Gateway, deployment *appsv1.Deployment) metav1.Condition { if len(gw.Status.Addresses) == 0 { return newCondition(string(gwapiv1.GatewayConditionProgrammed), metav1.ConditionFalse, string(gwapiv1.GatewayReasonAddressNotAssigned), diff --git a/internal/status/conditions_test.go b/internal/status/conditions_test.go index a1181b89b984..49e796530eee 100644 --- a/internal/status/conditions_test.go +++ b/internal/status/conditions_test.go @@ -25,6 +25,7 @@ import ( fakeclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) var clock utilclock.Clock = utilclock.RealClock{} @@ -68,7 +69,7 @@ func TestComputeGatewayClassAcceptedCondition(t *testing.T) { } for _, tc := range testCases { - gc := &gwapiv1.GatewayClass{ + gc := &gwapiv1b1.GatewayClass{ ObjectMeta: metav1.ObjectMeta{ Generation: 7, }, @@ -108,7 +109,7 @@ func TestComputeGatewayScheduledCondition(t *testing.T) { } for _, tc := range testCases { - gw := &gwapiv1.Gateway{ + gw := &gwapiv1b1.Gateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "test", Name: "test", @@ -320,7 +321,7 @@ func TestGatewayReadyCondition(t *testing.T) { tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() - gtw := &gwapiv1.Gateway{} + gtw := &gwapiv1b1.Gateway{} if tc.serviceAddress { gtw.Status = gwapiv1.GatewayStatus{ Addresses: []gwapiv1.GatewayStatusAddress{ diff --git a/internal/status/gateway.go b/internal/status/gateway.go index b62dffe66d45..c9f3229e6942 100644 --- a/internal/status/gateway.go +++ b/internal/status/gateway.go @@ -10,10 +10,11 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // UpdateGatewayStatusAcceptedCondition updates the status condition for the provided Gateway based on the accepted state. -func UpdateGatewayStatusAcceptedCondition(gw *gwapiv1.Gateway, accepted bool) *gwapiv1.Gateway { +func UpdateGatewayStatusAcceptedCondition(gw *gwapiv1b1.Gateway, accepted bool) *gwapiv1b1.Gateway { gw.Status.Conditions = MergeConditions(gw.Status.Conditions, computeGatewayAcceptedCondition(gw, accepted)) return gw } @@ -21,7 +22,7 @@ func UpdateGatewayStatusAcceptedCondition(gw *gwapiv1.Gateway, accepted bool) *g // UpdateGatewayStatusProgrammedCondition updates the status addresses for the provided gateway // based on the status IP/Hostname of svc and updates the Programmed condition based on the // service and deployment state. -func UpdateGatewayStatusProgrammedCondition(gw *gwapiv1.Gateway, svc *corev1.Service, deployment *appsv1.Deployment, nodeAddresses ...string) { +func UpdateGatewayStatusProgrammedCondition(gw *gwapiv1b1.Gateway, svc *corev1.Service, deployment *appsv1.Deployment, nodeAddresses ...string) { var addresses, hostnames []string // Update the status addresses field. if svc != nil { diff --git a/internal/status/gateway_test.go b/internal/status/gateway_test.go index c20d29b8ec05..d0b7a4baddb7 100644 --- a/internal/status/gateway_test.go +++ b/internal/status/gateway_test.go @@ -15,11 +15,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) { type args struct { - gw *gwapiv1.Gateway + gw *gwapiv1b1.Gateway svc *corev1.Service deployment *appsv1.Deployment addresses []gwapiv1.GatewayStatusAddress @@ -31,7 +32,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) { { name: "nil svc", args: args{ - gw: &gwapiv1.Gateway{}, + gw: &gwapiv1b1.Gateway{}, svc: nil, addresses: nil, }, @@ -39,7 +40,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) { { name: "LoadBalancer svc with ingress ip", args: args{ - gw: &gwapiv1.Gateway{}, + gw: &gwapiv1b1.Gateway{}, svc: &corev1.Service{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{}, @@ -68,7 +69,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) { { name: "LoadBalancer svc with ingress hostname", args: args{ - gw: &gwapiv1.Gateway{}, + gw: &gwapiv1b1.Gateway{}, svc: &corev1.Service{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{}, @@ -101,7 +102,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) { { name: "ClusterIP svc", args: args{ - gw: &gwapiv1.Gateway{}, + gw: &gwapiv1b1.Gateway{}, svc: &corev1.Service{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{}, diff --git a/internal/status/gatewayclass.go b/internal/status/gatewayclass.go index 7a71ab236460..ba7168d2a21d 100644 --- a/internal/status/gatewayclass.go +++ b/internal/status/gatewayclass.go @@ -14,12 +14,12 @@ package status import ( - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // SetGatewayClassAccepted inserts or updates the Accepted condition // for the provided GatewayClass. -func SetGatewayClassAccepted(gc *gwapiv1.GatewayClass, accepted bool, reason, msg string) *gwapiv1.GatewayClass { +func SetGatewayClassAccepted(gc *gwapiv1b1.GatewayClass, accepted bool, reason, msg string) *gwapiv1b1.GatewayClass { gc.Status.Conditions = MergeConditions(gc.Status.Conditions, computeGatewayClassAcceptedCondition(gc, accepted, reason, msg)) return gc } diff --git a/internal/status/status.go b/internal/status/status.go index 4f945e2ca9c4..652247432ef6 100644 --- a/internal/status/status.go +++ b/internal/status/status.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" ) @@ -174,20 +174,20 @@ func (u *UpdateWriter) Send(update Update) { func isStatusEqual(objA, objB interface{}) bool { opts := cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime") switch a := objA.(type) { - case *gwapiv1.GatewayClass: - if b, ok := objB.(*gwapiv1.GatewayClass); ok { + case *gwapiv1b1.GatewayClass: + if b, ok := objB.(*gwapiv1b1.GatewayClass); ok { if cmp.Equal(a.Status, b.Status, opts) { return true } } - case *gwapiv1.Gateway: - if b, ok := objB.(*gwapiv1.Gateway); ok { + case *gwapiv1b1.Gateway: + if b, ok := objB.(*gwapiv1b1.Gateway); ok { if cmp.Equal(a.Status, b.Status, opts) { return true } } - case *gwapiv1.HTTPRoute: - if b, ok := objB.(*gwapiv1.HTTPRoute); ok { + case *gwapiv1b1.HTTPRoute: + if b, ok := objB.(*gwapiv1b1.HTTPRoute); ok { if cmp.Equal(a.Status, b.Status, opts) { return true } diff --git a/test/config/gatewayclass.yaml b/test/config/gatewayclass.yaml index 65880b445f9c..cd0b1c34279f 100644 --- a/test/config/gatewayclass.yaml +++ b/test/config/gatewayclass.yaml @@ -1,5 +1,5 @@ kind: GatewayClass -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 metadata: name: envoy-gateway spec: diff --git a/test/e2e/base/manifests.yaml b/test/e2e/base/manifests.yaml index 9b401cda00d4..ee63b3b4cd8f 100644 --- a/test/e2e/base/manifests.yaml +++ b/test/e2e/base/manifests.yaml @@ -14,7 +14,7 @@ metadata: labels: gateway-conformance: infra --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: same-namespace @@ -29,7 +29,7 @@ spec: namespaces: from: Same --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: all-namespaces @@ -44,7 +44,7 @@ spec: namespaces: from: All --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway metadata: name: backend-namespaces diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 46e0fb30bec4..2778c1b94cf7 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -17,6 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/suite" @@ -33,6 +34,7 @@ func TestE2E(t *testing.T) { c, err := client.New(cfg, client.Options{}) require.NoError(t, err) require.NoError(t, gwapiv1a2.AddToScheme(c.Scheme())) + require.NoError(t, gwapiv1b1.AddToScheme(c.Scheme())) require.NoError(t, gwapiv1.AddToScheme(c.Scheme())) require.NoError(t, egv1a1.AddToScheme(c.Scheme())) diff --git a/test/e2e/testdata/accesslog-file.yaml b/test/e2e/testdata/accesslog-file.yaml index a6ab4998c7c2..18d164fc608e 100644 --- a/test/e2e/testdata/accesslog-file.yaml +++ b/test/e2e/testdata/accesslog-file.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: accesslog-file diff --git a/test/e2e/testdata/accesslog-otel.yaml b/test/e2e/testdata/accesslog-otel.yaml index a4a58cc3b379..8f9e4924080f 100644 --- a/test/e2e/testdata/accesslog-otel.yaml +++ b/test/e2e/testdata/accesslog-otel.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: accesslog-otel diff --git a/test/e2e/testdata/backend-tls.yaml b/test/e2e/testdata/backend-tls.yaml index 1ad708c2fb5c..7e916608b534 100644 --- a/test/e2e/testdata/backend-tls.yaml +++ b/test/e2e/testdata/backend-tls.yaml @@ -118,7 +118,7 @@ spec: kind: ConfigMap hostname: example.com --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-backend-tls @@ -148,7 +148,7 @@ spec: port: 443 targetPort: 8443 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-without-backend-tls diff --git a/test/e2e/testdata/backend-upgrade.yaml b/test/e2e/testdata/backend-upgrade.yaml index e708342406da..dfeaafa5e62e 100644 --- a/test/e2e/testdata/backend-upgrade.yaml +++ b/test/e2e/testdata/backend-upgrade.yaml @@ -20,7 +20,7 @@ spec: - reset numRetries: 10 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-backend-upgrade diff --git a/test/e2e/testdata/basic-auth.yaml b/test/e2e/testdata/basic-auth.yaml index 036bb788eaa9..30f63ceed6c4 100644 --- a/test/e2e/testdata/basic-auth.yaml +++ b/test/e2e/testdata/basic-auth.yaml @@ -15,7 +15,7 @@ metadata: data: .htpasswd: "dXNlcjM6e1NIQX1QcitqQWR4WkdXOFlXVHhGNVJrb2VpTXBkWWs9CnVzZXI0OntTSEF9SC9LemNFcnQ0RTdzdFI1UXltbU8vVkNoTjVzPQ==" --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-basic-auth-1 @@ -32,7 +32,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-basic-auth-2 diff --git a/test/e2e/testdata/circuitbreaker.yaml b/test/e2e/testdata/circuitbreaker.yaml index 912c041cf80f..546a9f4c0dec 100644 --- a/test/e2e/testdata/circuitbreaker.yaml +++ b/test/e2e/testdata/circuitbreaker.yaml @@ -14,7 +14,7 @@ spec: maxParallelRequests: 0 maxPendingRequests: 0 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-circuitbreaker diff --git a/test/e2e/testdata/client-timeout.yaml b/test/e2e/testdata/client-timeout.yaml index a2776dffbf60..ed2450b39ea8 100644 --- a/test/e2e/testdata/client-timeout.yaml +++ b/test/e2e/testdata/client-timeout.yaml @@ -13,7 +13,7 @@ spec: http: requestReceivedTimeout: 1ms --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-client-timeout diff --git a/test/e2e/testdata/cors.yaml b/test/e2e/testdata/cors.yaml index c823b97f6462..6409c9ba6bd2 100644 --- a/test/e2e/testdata/cors.yaml +++ b/test/e2e/testdata/cors.yaml @@ -28,7 +28,7 @@ spec: - "x-header-3" - "x-header-4" --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-cors diff --git a/test/e2e/testdata/eg-upgrade.yaml b/test/e2e/testdata/eg-upgrade.yaml index 864ccb6a64ee..97a22dd4a477 100644 --- a/test/e2e/testdata/eg-upgrade.yaml +++ b/test/e2e/testdata/eg-upgrade.yaml @@ -20,7 +20,7 @@ spec: - reset numRetries: 10 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-backend-eg-upgrade diff --git a/test/e2e/testdata/envoy-patch-policy.yaml b/test/e2e/testdata/envoy-patch-policy.yaml index e8f56215278c..fa63ead7c804 100644 --- a/test/e2e/testdata/envoy-patch-policy.yaml +++ b/test/e2e/testdata/envoy-patch-policy.yaml @@ -1,5 +1,5 @@ --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-envoy-patch-policy diff --git a/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml b/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml index 1e8df0a4d548..e44d494a6625 100644 --- a/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml +++ b/test/e2e/testdata/ext-auth-grpc-securitypolicy.yaml @@ -1,5 +1,5 @@ --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-ext-auth @@ -17,7 +17,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-without-ext-auth diff --git a/test/e2e/testdata/ext-auth-http-securitypolicy.yaml b/test/e2e/testdata/ext-auth-http-securitypolicy.yaml index 1ebcc9e34f95..22c6503adb5b 100644 --- a/test/e2e/testdata/ext-auth-http-securitypolicy.yaml +++ b/test/e2e/testdata/ext-auth-http-securitypolicy.yaml @@ -1,5 +1,5 @@ --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-ext-auth @@ -17,7 +17,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-without-ext-auth diff --git a/test/e2e/testdata/fault-injection.yaml b/test/e2e/testdata/fault-injection.yaml index 13ec352d7aa3..888779b8d7be 100644 --- a/test/e2e/testdata/fault-injection.yaml +++ b/test/e2e/testdata/fault-injection.yaml @@ -30,7 +30,7 @@ spec: abort: httpStatus: 500 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-fault-abort @@ -47,7 +47,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-route-delayandabort diff --git a/test/e2e/testdata/jwt.yaml b/test/e2e/testdata/jwt.yaml index 01cb370651d0..99389b5ecb15 100644 --- a/test/e2e/testdata/jwt.yaml +++ b/test/e2e/testdata/jwt.yaml @@ -22,7 +22,7 @@ spec: remoteJWKS: uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/jwt/jwks.json --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: jwt-claim-routing diff --git a/test/e2e/testdata/local-ratelimit.yaml b/test/e2e/testdata/local-ratelimit.yaml index e0e5513a03ac..ff9822b7d14a 100644 --- a/test/e2e/testdata/local-ratelimit.yaml +++ b/test/e2e/testdata/local-ratelimit.yaml @@ -43,7 +43,7 @@ spec: requests: 3 unit: Hour --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-ratelimit-specific-user @@ -60,7 +60,7 @@ spec: type: Exact value: /ratelimit-specific-user --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-ratelimit-all-traffic @@ -77,7 +77,7 @@ spec: type: Exact value: /ratelimit-all-traffic --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-no-ratelimit diff --git a/test/e2e/testdata/metric.yaml b/test/e2e/testdata/metric.yaml index 2d2c26311dcd..9417bd0c670a 100644 --- a/test/e2e/testdata/metric.yaml +++ b/test/e2e/testdata/metric.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: metric-prometheus diff --git a/test/e2e/testdata/oidc-securitypolicy.yaml b/test/e2e/testdata/oidc-securitypolicy.yaml index 0350979aa188..4de9bd7fb241 100644 --- a/test/e2e/testdata/oidc-securitypolicy.yaml +++ b/test/e2e/testdata/oidc-securitypolicy.yaml @@ -1,5 +1,5 @@ --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-with-oidc @@ -17,7 +17,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-without-oidc @@ -35,7 +35,7 @@ spec: - name: infra-backend-v1 port: 8080 --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-keycloak diff --git a/test/e2e/testdata/preserve-case.yaml b/test/e2e/testdata/preserve-case.yaml index 53d521d7ea84..03a249ffe109 100644 --- a/test/e2e/testdata/preserve-case.yaml +++ b/test/e2e/testdata/preserve-case.yaml @@ -26,7 +26,7 @@ spec: http1: preserveHeaderCase: true --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: preserve-case diff --git a/test/e2e/testdata/ratelimit-based-jwt-claims.yaml b/test/e2e/testdata/ratelimit-based-jwt-claims.yaml index d16e9c1ebdb7..7b429ac49d4d 100644 --- a/test/e2e/testdata/ratelimit-based-jwt-claims.yaml +++ b/test/e2e/testdata/ratelimit-based-jwt-claims.yaml @@ -41,7 +41,7 @@ spec: requests: 3 unit: Hour --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-ratelimit-based-jwt-claims @@ -58,7 +58,7 @@ spec: type: PathPrefix value: /foo --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: http-no-ratelimit diff --git a/test/e2e/testdata/ratelimit-cidr-match.yaml b/test/e2e/testdata/ratelimit-cidr-match.yaml index 4ee92d26fcd5..181e5260c281 100644 --- a/test/e2e/testdata/ratelimit-cidr-match.yaml +++ b/test/e2e/testdata/ratelimit-cidr-match.yaml @@ -21,7 +21,7 @@ spec: requests: 3 unit: Hour --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: cidr-ratelimit diff --git a/test/e2e/testdata/ratelimit-header-match.yaml b/test/e2e/testdata/ratelimit-header-match.yaml index d38d66a5a793..0e5150aba195 100644 --- a/test/e2e/testdata/ratelimit-header-match.yaml +++ b/test/e2e/testdata/ratelimit-header-match.yaml @@ -25,7 +25,7 @@ spec: requests: 3 unit: Hour --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: header-ratelimit diff --git a/test/e2e/testdata/retry.yaml b/test/e2e/testdata/retry.yaml index bacb78b1d605..a7b1b4abe321 100644 --- a/test/e2e/testdata/retry.yaml +++ b/test/e2e/testdata/retry.yaml @@ -23,7 +23,7 @@ spec: - connect-failure - retriable-status-codes --- -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: retry-route diff --git a/test/e2e/testdata/tracing-otel.yaml b/test/e2e/testdata/tracing-otel.yaml index f5b896a91c87..b02e4943a122 100644 --- a/test/e2e/testdata/tracing-otel.yaml +++ b/test/e2e/testdata/tracing-otel.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: tracing-otel diff --git a/test/e2e/testdata/weight-backend-completing-rollout.yaml b/test/e2e/testdata/weight-backend-completing-rollout.yaml index 2a36b5571225..8f92c02373a5 100644 --- a/test/e2e/testdata/weight-backend-completing-rollout.yaml +++ b/test/e2e/testdata/weight-backend-completing-rollout.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: weight-complete-rollout-http-route diff --git a/test/e2e/testdata/weighted-backend-all-equal.yaml b/test/e2e/testdata/weighted-backend-all-equal.yaml index b81edeb4ae84..db1fce7d6cb1 100644 --- a/test/e2e/testdata/weighted-backend-all-equal.yaml +++ b/test/e2e/testdata/weighted-backend-all-equal.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: weight-equal-http-route diff --git a/test/e2e/testdata/weighted-backend-bluegreen.yaml b/test/e2e/testdata/weighted-backend-bluegreen.yaml index 13be4ab26a14..dcc2abf2cf32 100644 --- a/test/e2e/testdata/weighted-backend-bluegreen.yaml +++ b/test/e2e/testdata/weighted-backend-bluegreen.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.networking.k8s.io/v1 +apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: weight-bluegreen-http-route diff --git a/test/e2e/tests/tcp_route.go b/test/e2e/tests/tcp_route.go index 0aa8b609e798..c039ccfa0bdc 100644 --- a/test/e2e/tests/tcp_route.go +++ b/test/e2e/tests/tcp_route.go @@ -30,6 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) func init() { @@ -134,7 +135,7 @@ func WaitForGatewayAddress(t *testing.T, client client.Client, timeoutConfig con var ipAddr, port string waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, timeoutConfig.GatewayMustHaveAddress, true, func(ctx context.Context) (bool, error) { - gw := &gatewayv1.Gateway{} + gw := &gatewayv1b1.Gateway{} err := client.Get(ctx, gwName, gw) if err != nil { t.Logf("error fetching Gateway: %v", err) diff --git a/test/e2e/upgrade/eg_upgrade_test.go b/test/e2e/upgrade/eg_upgrade_test.go index cad06b66073a..1d909f151f13 100644 --- a/test/e2e/upgrade/eg_upgrade_test.go +++ b/test/e2e/upgrade/eg_upgrade_test.go @@ -17,6 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/suite" @@ -33,6 +34,7 @@ func TestEGUpgrade(t *testing.T) { c, err := client.New(cfg, client.Options{}) require.NoError(t, err) require.NoError(t, gwapiv1a2.AddToScheme(c.Scheme())) + require.NoError(t, gwapiv1b1.AddToScheme(c.Scheme())) require.NoError(t, gwapiv1.AddToScheme(c.Scheme())) require.NoError(t, egv1a1.AddToScheme(c.Scheme()))