From 4226330f99f699001514e55dd13a85c4a9a66b09 Mon Sep 17 00:00:00 2001 From: Yuval Kohavi Date: Tue, 28 Jan 2025 15:10:06 -0500 Subject: [PATCH 1/3] group gateway.gloo.solo.io -> gateway.kgateway.dev --- ...ses.yaml => gateway.kgateway.dev_directresponses.yaml} | 4 ++-- ...s.yaml => gateway.kgateway.dev_gatewayparameters.yaml} | 4 ++-- ...aml => gateway.kgateway.dev_httplistenerpolicies.yaml} | 4 ++-- ...es.yaml => gateway.kgateway.dev_listenerpolicies.yaml} | 4 ++-- ...icies.yaml => gateway.kgateway.dev_routepolicies.yaml} | 4 ++-- ...upstreams.yaml => gateway.kgateway.dev_upstreams.yaml} | 4 ++-- install/helm/kgateway/templates/gatewayparameters.yaml | 2 +- install/helm/kgateway/templates/role.yaml | 4 ++-- install/helm/kgateway/values.yaml | 4 ++-- .../api/applyconfiguration/api/v1alpha1/directresponse.go | 4 ++-- .../applyconfiguration/api/v1alpha1/gatewayparameters.go | 4 ++-- .../applyconfiguration/api/v1alpha1/httplistenerpolicy.go | 4 ++-- .../api/applyconfiguration/api/v1alpha1/listenerpolicy.go | 4 ++-- .../api/applyconfiguration/api/v1alpha1/routepolicy.go | 4 ++-- .../api/applyconfiguration/api/v1alpha1/upstream.go | 4 ++-- projects/gateway2/api/applyconfiguration/utils.go | 2 +- projects/gateway2/api/v1alpha1/direct_response_types.go | 4 ++-- projects/gateway2/api/v1alpha1/doc.go | 2 +- .../gateway2/api/v1alpha1/gateway_parameters_types.go | 4 ++-- .../gateway2/api/v1alpha1/http_listener_policy_types.go | 4 ++-- projects/gateway2/api/v1alpha1/listener_policy_types.go | 4 ++-- projects/gateway2/api/v1alpha1/route_policy_types.go | 4 ++-- projects/gateway2/api/v1alpha1/upstream_policy_types.go | 4 ++-- projects/gateway2/api/v1alpha1/zz_generated.register.go | 2 +- projects/gateway2/controller/gw_controller.go | 2 +- .../gateway2/examples/example-direct-response-route.yaml | 4 ++-- .../clientset/versioned/typed/api/v1alpha1/api_client.go | 2 +- projects/gateway2/setup/testdata/listeneropts.yaml | 2 +- projects/gateway2/setup/testdata/setupyaml/setup.yaml | 4 ++-- .../gateway/testutils/inputs/directresponse/manifest.yaml | 4 ++-- .../inputs/http-with-lambda-destination/manifests.yaml | 4 ++-- projects/gateway2/wellknown/controller.go | 2 +- test/helpers/kube_dump.go | 2 +- test/kubernetes/e2e/features/admin_server/suite.go | 2 +- .../admin_server/testdata/gateway-parameters.yaml | 2 +- .../deployer/testdata/gateway-with-parameters.yaml | 4 ++-- .../deployer/testdata/gatewayparameters-custom.yaml | 2 +- .../deployer/testdata/istio-gateway-parameters.yaml | 4 ++-- .../features/deployer/testdata/self-managed-gateway.yaml | 4 ++-- .../testdata/basic-delegation-direct-response.yaml | 8 ++++---- .../directresponse/testdata/basic-direct-response.yaml | 4 ++-- .../testdata/invalid-backendRef-filter.yaml | 4 ++-- .../testdata/invalid-delegation-conflicting-filters.yaml | 4 ++-- .../testdata/invalid-missing-ref-direct-response.yaml | 2 +- .../testdata/invalid-multiple-route-actions.yaml | 4 ++-- .../testdata/invalid-overlapping-filters.yaml | 8 ++++---- 46 files changed, 83 insertions(+), 83 deletions(-) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_directresponses.yaml => gateway.kgateway.dev_directresponses.yaml} (93%) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_gatewayparameters.yaml => gateway.kgateway.dev_gatewayparameters.yaml} (99%) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_httplistenerpolicies.yaml => gateway.kgateway.dev_httplistenerpolicies.yaml} (98%) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_listenerpolicies.yaml => gateway.kgateway.dev_listenerpolicies.yaml} (98%) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_routepolicies.yaml => gateway.kgateway.dev_routepolicies.yaml} (98%) rename install/helm/kgateway/crds/{gateway.gloo.solo.io_upstreams.yaml => gateway.kgateway.dev_upstreams.yaml} (98%) diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_directresponses.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_directresponses.yaml similarity index 93% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_directresponses.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_directresponses.yaml index 7be1f512ef5..f95586becaf 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_directresponses.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_directresponses.yaml @@ -7,9 +7,9 @@ metadata: labels: app: gloo-gateway app.kubernetes.io/name: gloo-gateway - name: directresponses.gateway.gloo.solo.io + name: directresponses.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gloo-gateway diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_gatewayparameters.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_gatewayparameters.yaml similarity index 99% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_gatewayparameters.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_gatewayparameters.yaml index e8bc579bc95..5568217d3c2 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_gatewayparameters.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_gatewayparameters.yaml @@ -7,9 +7,9 @@ metadata: labels: app: gloo-gateway app.kubernetes.io/name: gloo-gateway - name: gatewayparameters.gateway.gloo.solo.io + name: gatewayparameters.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gloo-gateway diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_httplistenerpolicies.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_httplistenerpolicies.yaml similarity index 98% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_httplistenerpolicies.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_httplistenerpolicies.yaml index cebe6f9077e..17bde4e9ede 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_httplistenerpolicies.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_httplistenerpolicies.yaml @@ -8,9 +8,9 @@ metadata: app: gateway app.kubernetes.io/name: gateway gateway.networking.k8s.io/policy: Direct - name: httplistenerpolicies.gateway.gloo.solo.io + name: httplistenerpolicies.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gateway diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_listenerpolicies.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_listenerpolicies.yaml similarity index 98% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_listenerpolicies.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_listenerpolicies.yaml index edc11e5e38f..8c9c8592c8f 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_listenerpolicies.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_listenerpolicies.yaml @@ -8,9 +8,9 @@ metadata: app: gateway app.kubernetes.io/name: gateway gateway.networking.k8s.io/policy: Direct - name: listenerpolicies.gateway.gloo.solo.io + name: listenerpolicies.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gateway diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_routepolicies.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_routepolicies.yaml similarity index 98% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_routepolicies.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_routepolicies.yaml index 0bdc2ba73c8..17bc695f19e 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_routepolicies.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_routepolicies.yaml @@ -8,9 +8,9 @@ metadata: app: gateway app.kubernetes.io/name: gateway gateway.networking.k8s.io/policy: Direct - name: routepolicies.gateway.gloo.solo.io + name: routepolicies.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gateway diff --git a/install/helm/kgateway/crds/gateway.gloo.solo.io_upstreams.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_upstreams.yaml similarity index 98% rename from install/helm/kgateway/crds/gateway.gloo.solo.io_upstreams.yaml rename to install/helm/kgateway/crds/gateway.kgateway.dev_upstreams.yaml index af8caa74355..a38b9cc8455 100644 --- a/install/helm/kgateway/crds/gateway.gloo.solo.io_upstreams.yaml +++ b/install/helm/kgateway/crds/gateway.kgateway.dev_upstreams.yaml @@ -7,9 +7,9 @@ metadata: labels: app: gateway app.kubernetes.io/name: gateway - name: upstreams.gateway.gloo.solo.io + name: upstreams.gateway.kgateway.dev spec: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev names: categories: - gateway diff --git a/install/helm/kgateway/templates/gatewayparameters.yaml b/install/helm/kgateway/templates/gatewayparameters.yaml index 5a8c4396fb4..a3609dd49d8 100644 --- a/install/helm/kgateway/templates/gatewayparameters.yaml +++ b/install/helm/kgateway/templates/gatewayparameters.yaml @@ -1,5 +1,5 @@ {{- if .Values.gatewayClass.parametersRef.enabled }} -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: {{ .Values.gatewayClass.parametersRef.name }} diff --git a/install/helm/kgateway/templates/role.yaml b/install/helm/kgateway/templates/role.yaml index ae4bc07ef95..aef3dfae471 100644 --- a/install/helm/kgateway/templates/role.yaml +++ b/install/helm/kgateway/templates/role.yaml @@ -69,7 +69,7 @@ rules: - list - watch - apiGroups: - - gateway.gloo.solo.io + - gateway.kgateway.dev resources: - directresponses - gatewayparameters @@ -82,7 +82,7 @@ rules: - list - watch - apiGroups: - - gateway.gloo.solo.io + - gateway.kgateway.dev resources: - directresponses/status - gatewayparameters/status diff --git a/install/helm/kgateway/values.yaml b/install/helm/kgateway/values.yaml index 1bed8f6725b..d9c04e8653a 100644 --- a/install/helm/kgateway/values.yaml +++ b/install/helm/kgateway/values.yaml @@ -74,7 +74,7 @@ gatewayClass: # Optional parameters reference parametersRef: enabled: true - group: "gateway.gloo.solo.io" + group: "gateway.kgateway.dev" kind: "GatewayParameters" # The name of the GatewayParameters which is attached by parametersRef to the GatewayClass name: "kgateway" @@ -83,7 +83,7 @@ gatewayClass: # Gateway proxy configuration gateway: # The name of the Gateway annotation that specifies the name of a GatewayParameters CR - parametersAnnotationName: "gateway.gloo.solo.io/gateway-parameters-name" + parametersAnnotationName: "gateway.kgateway.dev/gateway-parameters-name" envoyContainer: image: registry: ghcr.io/kgateway-dev diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go index d9602ae23f9..ad691dc6d00 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go @@ -27,7 +27,7 @@ func DirectResponse(name, namespace string) *DirectResponseApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("DirectResponse") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractDirectResponse(directResponse *apiv1alpha1.DirectResponse, fieldMana b.WithNamespace(directResponse.Namespace) b.WithKind("DirectResponse") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go index 80f553e2c4b..7bcdfec1b95 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go @@ -27,7 +27,7 @@ func GatewayParameters(name, namespace string) *GatewayParametersApplyConfigurat b.WithName(name) b.WithNamespace(namespace) b.WithKind("GatewayParameters") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractGatewayParameters(gatewayParameters *apiv1alpha1.GatewayParameters, b.WithNamespace(gatewayParameters.Namespace) b.WithKind("GatewayParameters") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go index 612ba432cdd..4ec55657999 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go @@ -27,7 +27,7 @@ func HttpListenerPolicy(name, namespace string) *HttpListenerPolicyApplyConfigur b.WithName(name) b.WithNamespace(namespace) b.WithKind("HttpListenerPolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractHttpListenerPolicy(httpListenerPolicy *apiv1alpha1.HttpListenerPolic b.WithNamespace(httpListenerPolicy.Namespace) b.WithKind("HttpListenerPolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go index 2d162270a7f..9c8c3223ad9 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go @@ -27,7 +27,7 @@ func ListenerPolicy(name, namespace string) *ListenerPolicyApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("ListenerPolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractListenerPolicy(listenerPolicy *apiv1alpha1.ListenerPolicy, fieldMana b.WithNamespace(listenerPolicy.Namespace) b.WithKind("ListenerPolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go index 4ecc4a564fc..936b8c385cc 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go @@ -27,7 +27,7 @@ func RoutePolicy(name, namespace string) *RoutePolicyApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("RoutePolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractRoutePolicy(routePolicy *apiv1alpha1.RoutePolicy, fieldManager strin b.WithNamespace(routePolicy.Namespace) b.WithKind("RoutePolicy") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go b/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go index fd9f3e11614..09ef7553504 100644 --- a/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go +++ b/projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go @@ -27,7 +27,7 @@ func Upstream(name, namespace string) *UpstreamApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("Upstream") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b } @@ -63,7 +63,7 @@ func extractUpstream(upstream *apiv1alpha1.Upstream, fieldManager string, subres b.WithNamespace(upstream.Namespace) b.WithKind("Upstream") - b.WithAPIVersion("gateway.gloo.solo.io/v1alpha1") + b.WithAPIVersion("gateway.kgateway.dev/v1alpha1") return b, nil } diff --git a/projects/gateway2/api/applyconfiguration/utils.go b/projects/gateway2/api/applyconfiguration/utils.go index 270bdede446..0eb3b41c517 100644 --- a/projects/gateway2/api/applyconfiguration/utils.go +++ b/projects/gateway2/api/applyconfiguration/utils.go @@ -15,7 +15,7 @@ import ( // apply configuration type exists for the given GroupVersionKind. func ForKind(kind schema.GroupVersionKind) interface{} { switch kind { - // Group=gateway.gloo.solo.io, Version=v1alpha1 + // Group=gateway.kgateway.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithKind("AiExtension"): return &apiv1alpha1.AiExtensionApplyConfiguration{} case v1alpha1.SchemeGroupVersion.WithKind("AiExtensionStats"): diff --git a/projects/gateway2/api/v1alpha1/direct_response_types.go b/projects/gateway2/api/v1alpha1/direct_response_types.go index 197ddb254fb..36159891460 100644 --- a/projects/gateway2/api/v1alpha1/direct_response_types.go +++ b/projects/gateway2/api/v1alpha1/direct_response_types.go @@ -4,8 +4,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=directresponses,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=directresponses/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=directresponses,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=directresponses/status,verbs=get;update;patch // DirectResponse contains configuration for defining direct response routes. // diff --git a/projects/gateway2/api/v1alpha1/doc.go b/projects/gateway2/api/v1alpha1/doc.go index 7a2d0063663..cce5e9a1b33 100644 --- a/projects/gateway2/api/v1alpha1/doc.go +++ b/projects/gateway2/api/v1alpha1/doc.go @@ -1,6 +1,6 @@ // +k8s:openapi-gen=true // +kubebuilder:object:generate=true -// +groupName=gateway.gloo.solo.io +// +groupName=gateway.kgateway.dev package v1alpha1 // Gateway API resources with status management diff --git a/projects/gateway2/api/v1alpha1/gateway_parameters_types.go b/projects/gateway2/api/v1alpha1/gateway_parameters_types.go index f08b437e9f3..26705766092 100644 --- a/projects/gateway2/api/v1alpha1/gateway_parameters_types.go +++ b/projects/gateway2/api/v1alpha1/gateway_parameters_types.go @@ -5,8 +5,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=gatewayparameters,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=gatewayparameters/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=gatewayparameters,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=gatewayparameters/status,verbs=get;update;patch // A GatewayParameters contains configuration that is used to dynamically // provision Gloo Gateway's data plane (Envoy proxy instance), based on a diff --git a/projects/gateway2/api/v1alpha1/http_listener_policy_types.go b/projects/gateway2/api/v1alpha1/http_listener_policy_types.go index e2753f50ff5..ab71bd916d5 100644 --- a/projects/gateway2/api/v1alpha1/http_listener_policy_types.go +++ b/projects/gateway2/api/v1alpha1/http_listener_policy_types.go @@ -4,8 +4,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=httplistenerpolicies,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=httplistenerpolicies/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=httplistenerpolicies,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=httplistenerpolicies/status,verbs=get;update;patch // +genclient // +kubebuilder:object:root=true diff --git a/projects/gateway2/api/v1alpha1/listener_policy_types.go b/projects/gateway2/api/v1alpha1/listener_policy_types.go index 3603337fceb..487fff2198d 100644 --- a/projects/gateway2/api/v1alpha1/listener_policy_types.go +++ b/projects/gateway2/api/v1alpha1/listener_policy_types.go @@ -4,8 +4,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=listenerpolicies,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=listenerpolicies/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=listenerpolicies,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=listenerpolicies/status,verbs=get;update;patch // +genclient // +kubebuilder:object:root=true diff --git a/projects/gateway2/api/v1alpha1/route_policy_types.go b/projects/gateway2/api/v1alpha1/route_policy_types.go index 896bf34a6b1..a498082ea10 100644 --- a/projects/gateway2/api/v1alpha1/route_policy_types.go +++ b/projects/gateway2/api/v1alpha1/route_policy_types.go @@ -4,8 +4,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=routepolicies,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=routepolicies/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=routepolicies,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=routepolicies/status,verbs=get;update;patch // +genclient // +kubebuilder:object:root=true diff --git a/projects/gateway2/api/v1alpha1/upstream_policy_types.go b/projects/gateway2/api/v1alpha1/upstream_policy_types.go index 39a4974d8b8..a65ea35e4f1 100644 --- a/projects/gateway2/api/v1alpha1/upstream_policy_types.go +++ b/projects/gateway2/api/v1alpha1/upstream_policy_types.go @@ -6,8 +6,8 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" ) -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=upstreams,verbs=get;list;watch -// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=upstreams/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=upstreams,verbs=get;list;watch +// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=upstreams/status,verbs=get;update;patch // +genclient // +kubebuilder:object:root=true diff --git a/projects/gateway2/api/v1alpha1/zz_generated.register.go b/projects/gateway2/api/v1alpha1/zz_generated.register.go index 6c5933b0f09..2a0d219fc96 100644 --- a/projects/gateway2/api/v1alpha1/zz_generated.register.go +++ b/projects/gateway2/api/v1alpha1/zz_generated.register.go @@ -12,7 +12,7 @@ import ( ) // GroupName specifies the group name used to register the objects. -const GroupName = "gateway.gloo.solo.io" +const GroupName = "gateway.kgateway.dev" // GroupVersion specifies the group and the version used to register the objects. var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/projects/gateway2/controller/gw_controller.go b/projects/gateway2/controller/gw_controller.go index 3bd1f2050a6..02a6b9c9d11 100644 --- a/projects/gateway2/controller/gw_controller.go +++ b/projects/gateway2/controller/gw_controller.go @@ -15,7 +15,7 @@ import ( ) const ( - GatewayAutoDeployAnnotationKey = "gateway.gloo.solo.io/auto-deploy" + GatewayAutoDeployAnnotationKey = "gateway.kgateway.dev/auto-deploy" ) type gatewayReconciler struct { diff --git a/projects/gateway2/examples/example-direct-response-route.yaml b/projects/gateway2/examples/example-direct-response-route.yaml index e02bd06b1da..caf9a9b960a 100644 --- a/projects/gateway2/examples/example-direct-response-route.yaml +++ b/projects/gateway2/examples/example-direct-response-route.yaml @@ -43,10 +43,10 @@ spec: - type: ExtensionRef extensionRef: name: robots-txt - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: robots-txt diff --git a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go index 343f867179d..44f4235436f 100644 --- a/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go +++ b/projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go @@ -20,7 +20,7 @@ type GatewayV1alpha1Interface interface { UpstreamsGetter } -// GatewayV1alpha1Client is used to interact with features provided by the gateway.gloo.solo.io group. +// GatewayV1alpha1Client is used to interact with features provided by the gateway.kgateway.dev group. type GatewayV1alpha1Client struct { restClient rest.Interface } diff --git a/projects/gateway2/setup/testdata/listeneropts.yaml b/projects/gateway2/setup/testdata/listeneropts.yaml index 87dcd187f9f..a13b2d7d6ec 100644 --- a/projects/gateway2/setup/testdata/listeneropts.yaml +++ b/projects/gateway2/setup/testdata/listeneropts.yaml @@ -75,7 +75,7 @@ spec: - name: reviews port: 8080 --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: ListenerPolicy metadata: name: buffer-limit diff --git a/projects/gateway2/setup/testdata/setupyaml/setup.yaml b/projects/gateway2/setup/testdata/setupyaml/setup.yaml index 82898e72231..6b2b9deb4c4 100644 --- a/projects/gateway2/setup/testdata/setupyaml/setup.yaml +++ b/projects/gateway2/setup/testdata/setupyaml/setup.yaml @@ -5,13 +5,13 @@ metadata: spec: controllerName: kgateway.io/kgateway parametersRef: - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: GatewayParameters name: kgateway namespace: default --- kind: GatewayParameters -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 metadata: name: kgateway spec: diff --git a/projects/gateway2/translator/gateway/testutils/inputs/directresponse/manifest.yaml b/projects/gateway2/translator/gateway/testutils/inputs/directresponse/manifest.yaml index 7679745480c..d5cb309b02b 100644 --- a/projects/gateway2/translator/gateway/testutils/inputs/directresponse/manifest.yaml +++ b/projects/gateway2/translator/gateway/testutils/inputs/directresponse/manifest.yaml @@ -12,7 +12,7 @@ spec: namespaces: from: Same --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: direct-response @@ -34,5 +34,5 @@ spec: - type: ExtensionRef extensionRef: name: direct-response - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse \ No newline at end of file diff --git a/projects/gateway2/translator/gateway/testutils/inputs/http-with-lambda-destination/manifests.yaml b/projects/gateway2/translator/gateway/testutils/inputs/http-with-lambda-destination/manifests.yaml index 6c8e3bba0fa..d9961f1b53d 100644 --- a/projects/gateway2/translator/gateway/testutils/inputs/http-with-lambda-destination/manifests.yaml +++ b/projects/gateway2/translator/gateway/testutils/inputs/http-with-lambda-destination/manifests.yaml @@ -25,7 +25,7 @@ spec: - backendRefs: - name: aws-upstream kind: Upstream - group: gateway.gloo.solo.io + group: gateway.kgateway.dev filters: - type: ExtensionRef extensionRef: @@ -33,7 +33,7 @@ spec: kind: Parameter name: uppercase --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: Upstream metadata: name: aws-upstream diff --git a/projects/gateway2/wellknown/controller.go b/projects/gateway2/wellknown/controller.go index b0e31b7dcc0..060b9ec3c69 100644 --- a/projects/gateway2/wellknown/controller.go +++ b/projects/gateway2/wellknown/controller.go @@ -12,7 +12,7 @@ const ( // the name of a GatewayParameters CR, which is used to dynamically provision the data plane // resources for the Gateway. The GatewayParameters is assumed to be in the same namespace // as the Gateway. - GatewayParametersAnnotationName = "gateway.gloo.solo.io/gateway-parameters-name" + GatewayParametersAnnotationName = "gateway.kgateway.dev/gateway-parameters-name" // DefaultGatewayParametersName is the name of the GatewayParameters which is attached by // parametersRef to the GatewayClass. diff --git a/test/helpers/kube_dump.go b/test/helpers/kube_dump.go index 0436e7fa763..133c4a131a8 100644 --- a/test/helpers/kube_dump.go +++ b/test/helpers/kube_dump.go @@ -129,7 +129,7 @@ func recordKubeState(f *os.File) { "httproutes.gateway.networking.k8s.io", "referencegrants.gateway.networking.k8s.io", // GG Kube GW resources - "gatewayparameters.gateway.gloo.solo.io", + "gatewayparameters.gateway.kgateway.dev", "listeneroptions.gateway.solo.io", // only implemented for kube gw as of now "httplisteneroptions.gateway.solo.io", // only implemented for kube gw as of now // GG Gloo resources diff --git a/test/kubernetes/e2e/features/admin_server/suite.go b/test/kubernetes/e2e/features/admin_server/suite.go index 3501159b9bd..e344e029cc1 100644 --- a/test/kubernetes/e2e/features/admin_server/suite.go +++ b/test/kubernetes/e2e/features/admin_server/suite.go @@ -87,7 +87,7 @@ func (s *testingSuite) TestGetInputSnapshotIncludesK8sGatewayApiResources() { }) err := s.testInstallation.Actions.Kubectl().ApplyFile(s.ctx, gatewayParametersManifest) - s.Assert().NoError(err, "can apply gateway.gloo.solo.io GatewayParameters manifest") + s.Assert().NoError(err, "can apply gateway.kgateway.dev GatewayParameters manifest") s.testInstallation.Assertions.AssertGlooAdminApi( s.ctx, diff --git a/test/kubernetes/e2e/features/admin_server/testdata/gateway-parameters.yaml b/test/kubernetes/e2e/features/admin_server/testdata/gateway-parameters.yaml index 05d71865b1c..a0edba37a63 100644 --- a/test/kubernetes/e2e/features/admin_server/testdata/gateway-parameters.yaml +++ b/test/kubernetes/e2e/features/admin_server/testdata/gateway-parameters.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: gw-params diff --git a/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml b/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml index 22b7a2ce139..804f71929af 100644 --- a/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml +++ b/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml @@ -3,7 +3,7 @@ kind: Gateway metadata: name: gw annotations: - gateway.gloo.solo.io/gateway-parameters-name: "gw-params" + gateway.kgateway.dev/gateway-parameters-name: "gw-params" spec: gatewayClassName: gloo-gateway listeners: @@ -28,7 +28,7 @@ spec: - name: nginx port: 8080 --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: gw-params diff --git a/test/kubernetes/e2e/features/deployer/testdata/gatewayparameters-custom.yaml b/test/kubernetes/e2e/features/deployer/testdata/gatewayparameters-custom.yaml index d085fefe1d6..99518f50bc6 100644 --- a/test/kubernetes/e2e/features/deployer/testdata/gatewayparameters-custom.yaml +++ b/test/kubernetes/e2e/features/deployer/testdata/gatewayparameters-custom.yaml @@ -1,4 +1,4 @@ -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: gw-params-custom diff --git a/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml b/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml index a1a64f3cd84..3e297edfa3b 100644 --- a/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml +++ b/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml @@ -3,7 +3,7 @@ kind: Gateway metadata: name: gw annotations: - gateway.gloo.solo.io/gateway-parameters-name: "gw-params" + gateway.kgateway.dev/gateway-parameters-name: "gw-params" spec: gatewayClassName: gloo-gateway listeners: @@ -28,7 +28,7 @@ spec: - name: nginx port: 8080 --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: gw-params diff --git a/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml b/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml index a3ee7d68364..d975f46e179 100644 --- a/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml +++ b/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml @@ -3,7 +3,7 @@ kind: Gateway metadata: name: gloo-proxy-gw annotations: - gateway.gloo.solo.io/gateway-parameters-name: "gw-params" + gateway.kgateway.dev/gateway-parameters-name: "gw-params" spec: gatewayClassName: gloo-gateway listeners: @@ -14,7 +14,7 @@ spec: namespaces: from: All --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: GatewayParameters metadata: name: gw-params diff --git a/test/kubernetes/e2e/features/directresponse/testdata/basic-delegation-direct-response.yaml b/test/kubernetes/e2e/features/directresponse/testdata/basic-delegation-direct-response.yaml index dd0e200963a..9e58796a98f 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/basic-delegation-direct-response.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/basic-delegation-direct-response.yaml @@ -28,7 +28,7 @@ spec: - type: ExtensionRef extensionRef: name: parent-dr - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- apiVersion: gateway.networking.k8s.io/v1 @@ -55,10 +55,10 @@ spec: - type: ExtensionRef extensionRef: name: child-dr - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: parent-dr @@ -67,7 +67,7 @@ spec: status: 302 body: "Hello from parent route" --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: child-dr diff --git a/test/kubernetes/e2e/features/directresponse/testdata/basic-direct-response.yaml b/test/kubernetes/e2e/features/directresponse/testdata/basic-direct-response.yaml index 6b4e2851af6..b4794cde6dc 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/basic-direct-response.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/basic-direct-response.yaml @@ -28,10 +28,10 @@ spec: - type: ExtensionRef extensionRef: name: robots-txt - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: robots-txt diff --git a/test/kubernetes/e2e/features/directresponse/testdata/invalid-backendRef-filter.yaml b/test/kubernetes/e2e/features/directresponse/testdata/invalid-backendRef-filter.yaml index 10715c26dfc..1fcf8a69925 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/invalid-backendRef-filter.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/invalid-backendRef-filter.yaml @@ -24,10 +24,10 @@ spec: - type: ExtensionRef extensionRef: name: robots-txt - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: robots-txt diff --git a/test/kubernetes/e2e/features/directresponse/testdata/invalid-delegation-conflicting-filters.yaml b/test/kubernetes/e2e/features/directresponse/testdata/invalid-delegation-conflicting-filters.yaml index 3f803add8e5..125a9c23701 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/invalid-delegation-conflicting-filters.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/invalid-delegation-conflicting-filters.yaml @@ -24,7 +24,7 @@ spec: - type: ExtensionRef extensionRef: name: parent-dr - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- apiVersion: gateway.networking.k8s.io/v1 @@ -44,7 +44,7 @@ spec: - name: httpbin port: 8000 --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: parent-dr diff --git a/test/kubernetes/e2e/features/directresponse/testdata/invalid-missing-ref-direct-response.yaml b/test/kubernetes/e2e/features/directresponse/testdata/invalid-missing-ref-direct-response.yaml index a9cab843d8e..9beb127e1fe 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/invalid-missing-ref-direct-response.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/invalid-missing-ref-direct-response.yaml @@ -21,5 +21,5 @@ spec: - type: ExtensionRef extensionRef: name: non-existent-ref - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse diff --git a/test/kubernetes/e2e/features/directresponse/testdata/invalid-multiple-route-actions.yaml b/test/kubernetes/e2e/features/directresponse/testdata/invalid-multiple-route-actions.yaml index 6b9643e1ff0..19260886178 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/invalid-multiple-route-actions.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/invalid-multiple-route-actions.yaml @@ -21,10 +21,10 @@ spec: - type: ExtensionRef extensionRef: name: test-1 - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: test-1 diff --git a/test/kubernetes/e2e/features/directresponse/testdata/invalid-overlapping-filters.yaml b/test/kubernetes/e2e/features/directresponse/testdata/invalid-overlapping-filters.yaml index 7166d1c7ae7..8a12d8a4b2a 100644 --- a/test/kubernetes/e2e/features/directresponse/testdata/invalid-overlapping-filters.yaml +++ b/test/kubernetes/e2e/features/directresponse/testdata/invalid-overlapping-filters.yaml @@ -17,15 +17,15 @@ spec: - type: ExtensionRef extensionRef: name: test-1 - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse - type: ExtensionRef extensionRef: name: test-2 - group: gateway.gloo.solo.io + group: gateway.kgateway.dev kind: DirectResponse --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: test-1 @@ -34,7 +34,7 @@ spec: status: 301 body: "Test 1 body" --- -apiVersion: gateway.gloo.solo.io/v1alpha1 +apiVersion: gateway.kgateway.dev/v1alpha1 kind: DirectResponse metadata: name: test-2 From 846159ac947a926b6b5a57a3905483c17a3ddf1b Mon Sep 17 00:00:00 2001 From: Yuval Kohavi Date: Wed, 29 Jan 2025 08:43:04 -0500 Subject: [PATCH 2/3] add test for route policy and upstream --- .../setup/testdata/routeoptions-out.yaml | 150 ++++++++++++++++++ .../gateway2/setup/testdata/routeoptions.yaml | 82 ++++++++++ .../gateway2/setup/testdata/upstream-out.yaml | 145 +++++++++++++++++ .../gateway2/setup/testdata/upstream.yaml | 41 +++++ 4 files changed, 418 insertions(+) create mode 100644 projects/gateway2/setup/testdata/routeoptions-out.yaml create mode 100644 projects/gateway2/setup/testdata/routeoptions.yaml create mode 100644 projects/gateway2/setup/testdata/upstream-out.yaml create mode 100644 projects/gateway2/setup/testdata/upstream.yaml diff --git a/projects/gateway2/setup/testdata/routeoptions-out.yaml b/projects/gateway2/setup/testdata/routeoptions-out.yaml new file mode 100644 index 00000000000..45ed873cc71 --- /dev/null +++ b/projects/gateway2/setup/testdata/routeoptions-out.yaml @@ -0,0 +1,150 @@ +clusters: +- connectTimeout: 5s + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + metadata: {} + name: kube_default_kubernetes_443 + transportSocketMatches: + - match: + tlsMode: istio + name: tlsMode-istio + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + commonTlsContext: + alpnProtocols: + - istio + tlsCertificateSdsSecretConfigs: + - name: istio_server_cert + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + tlsParams: {} + validationContextSdsSecretConfig: + name: istio_validation_context + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + sni: outbound_.443_._.kubernetes.default.svc.cluster.local + - match: {} + name: tlsMode-disabled + transportSocket: + name: envoy.transport_sockets.raw_buffer + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer + type: EDS +- connectTimeout: 5s + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + metadata: {} + name: kube_gwtest_reviews_8080 + transportSocketMatches: + - match: + tlsMode: istio + name: tlsMode-istio + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + commonTlsContext: + alpnProtocols: + - istio + tlsCertificateSdsSecretConfigs: + - name: istio_server_cert + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + tlsParams: {} + validationContextSdsSecretConfig: + name: istio_validation_context + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + sni: outbound_.8080_._.reviews.gwtest.svc.cluster.local + - match: {} + name: tlsMode-disabled + transportSocket: + name: envoy.transport_sockets.raw_buffer + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer + type: EDS +endpoints: +- clusterName: kube_gwtest_reviews_8080 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 10.244.1.11 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 +listeners: +- address: + socketAddress: + address: '::' + ipv4Compat: true + portValue: 8080 + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + mergeSlashes: true + normalizePath: true + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: http + statPrefix: http + name: http + name: http +routes: +- ignorePortInHostMatching: true + name: http + virtualHosts: + - domains: + - www.example.com + name: http~www_example_com + routes: + - match: + prefix: / + name: http~www_example_com-route-0-httproute-routetimeout-gwtest-0-0-matcher-0 + route: + cluster: kube_gwtest_reviews_8080 + clusterNotFoundResponseCode: INTERNAL_SERVER_ERROR + timeout: 1s diff --git a/projects/gateway2/setup/testdata/routeoptions.yaml b/projects/gateway2/setup/testdata/routeoptions.yaml new file mode 100644 index 00000000000..be94f3ae647 --- /dev/null +++ b/projects/gateway2/setup/testdata/routeoptions.yaml @@ -0,0 +1,82 @@ +kind: Gateway +apiVersion: gateway.networking.k8s.io/v1 +metadata: + name: http-gw-for-test + namespace: gwtest +spec: + gatewayClassName: kgateway + listeners: + - protocol: HTTP + port: 8080 + name: http + allowedRoutes: + namespaces: + from: All +--- +apiVersion: v1 +kind: Service +metadata: + name: reviews + namespace: gwtest + labels: + app: reviews + service: reviews +spec: + ports: + - name: http + port: 8080 + targetPort: 8080 + selector: + app: reviews +--- +apiVersion: discovery.k8s.io/v1 +kind: EndpointSlice +metadata: + name: reviews-slice + namespace: gwtest + labels: + kubernetes.io/service-name: reviews + app: reviews + service: reviews +addressType: IPv4 +endpoints: + - addresses: + - 10.244.1.11 + conditions: + ready: true + nodeName: worker + targetRef: + kind: Pod + name: reviews-1 + namespace: default +ports: + - name: http + port: 8080 + protocol: TCP +--- +apiVersion: gateway.networking.k8s.io/v1beta1 +kind: HTTPRoute +metadata: + name: routetimeout + namespace: gwtest +spec: + parentRefs: + - name: http-gw-for-test + hostnames: + - "www.example.com" + rules: + - backendRefs: + - name: reviews + port: 8080 +--- +apiVersion: gateway.kgateway.dev/v1alpha1 +kind: RoutePolicy +metadata: + name: timeout + namespace: gwtest +spec: + timeout: 1 + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: routetimeout diff --git a/projects/gateway2/setup/testdata/upstream-out.yaml b/projects/gateway2/setup/testdata/upstream-out.yaml new file mode 100644 index 00000000000..14e422c4187 --- /dev/null +++ b/projects/gateway2/setup/testdata/upstream-out.yaml @@ -0,0 +1,145 @@ +clusters: +- connectTimeout: 5s + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + metadata: {} + name: kube_default_kubernetes_443 + transportSocketMatches: + - match: + tlsMode: istio + name: tlsMode-istio + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + commonTlsContext: + alpnProtocols: + - istio + tlsCertificateSdsSecretConfigs: + - name: istio_server_cert + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + tlsParams: {} + validationContextSdsSecretConfig: + name: istio_validation_context + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + sni: outbound_.443_._.kubernetes.default.svc.cluster.local + - match: {} + name: tlsMode-disabled + transportSocket: + name: envoy.transport_sockets.raw_buffer + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer + type: EDS +- connectTimeout: 5s + loadAssignment: + clusterName: upstream_gwtest_static_0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 8080 + healthCheckConfig: + hostname: 1.2.3.4 + hostname: 1.2.3.4 + metadata: {} + name: upstream_gwtest_static_0 + transportSocketMatches: + - match: + tlsMode: istio + name: tlsMode-istio + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + commonTlsContext: + alpnProtocols: + - istio + tlsCertificateSdsSecretConfigs: + - name: istio_server_cert + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + tlsParams: {} + validationContextSdsSecretConfig: + name: istio_validation_context + sdsConfig: + apiConfigSource: + apiType: GRPC + grpcServices: + - envoyGrpc: + clusterName: gateway_proxy_sds + setNodeOnFirstMessageOnly: true + transportApiVersion: V3 + resourceApiVersion: V3 + - match: {} + name: tlsMode-disabled + transportSocket: + name: envoy.transport_sockets.raw_buffer + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer + type: STATIC +listeners: +- address: + socketAddress: + address: '::' + ipv4Compat: true + portValue: 8080 + filterChains: + - filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + httpFilters: + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + mergeSlashes: true + normalizePath: true + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: http + statPrefix: http + name: http + name: http +routes: +- ignorePortInHostMatching: true + name: http + virtualHosts: + - domains: + - www.example.com + name: http~www_example_com + routes: + - match: + prefix: / + name: http~www_example_com-route-0-httproute-route-to-upstream-gwtest-0-0-matcher-0 + route: + cluster: upstream_gwtest_static_0 + clusterNotFoundResponseCode: INTERNAL_SERVER_ERROR diff --git a/projects/gateway2/setup/testdata/upstream.yaml b/projects/gateway2/setup/testdata/upstream.yaml new file mode 100644 index 00000000000..7d5eea27da3 --- /dev/null +++ b/projects/gateway2/setup/testdata/upstream.yaml @@ -0,0 +1,41 @@ +kind: Gateway +apiVersion: gateway.networking.k8s.io/v1 +metadata: + name: http-gw-for-test + namespace: gwtest +spec: + gatewayClassName: kgateway + listeners: + - protocol: HTTP + port: 8080 + name: http + allowedRoutes: + namespaces: + from: All +--- +apiVersion: gateway.networking.k8s.io/v1beta1 +kind: HTTPRoute +metadata: + name: route-to-upstream + namespace: gwtest +spec: + parentRefs: + - name: http-gw-for-test + hostnames: + - "www.example.com" + rules: + - backendRefs: + - name: static + kind: Upstream + group: gateway.kgateway.dev +--- +apiVersion: gateway.kgateway.dev/v1alpha1 +kind: Upstream +metadata: + name: static + namespace: gwtest +spec: + static: + hosts: + - host: 1.2.3.4 + port: 8080 \ No newline at end of file From 56a858535c3bc5bfadf6461c2bdbcdc568e1a654 Mon Sep 17 00:00:00 2001 From: Yuval Kohavi Date: Wed, 29 Jan 2025 10:12:57 -0500 Subject: [PATCH 3/3] use new crds in controller test --- projects/gateway2/controller/controller_suite_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gateway2/controller/controller_suite_test.go b/projects/gateway2/controller/controller_suite_test.go index c0223bc8a19..40c225bf3e5 100644 --- a/projects/gateway2/controller/controller_suite_test.go +++ b/projects/gateway2/controller/controller_suite_test.go @@ -74,7 +74,7 @@ var _ = BeforeSuite(func() { testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{ filepath.Join("..", "crds"), - filepath.Join("..", "..", "..", "install", "helm", "gloo", "crds"), + filepath.Join("..", "..", "..", "install", "helm", "kgateway", "crds"), }, ErrorIfCRDPathMissing: true, // set assets dir so we can run without the makefile