From 4b22373ea6fdd374851a8c96b02869d91761980a Mon Sep 17 00:00:00 2001 From: sh2 Date: Thu, 9 May 2024 06:43:21 +0800 Subject: [PATCH 1/8] chore: add gateway-api/apis/v1alpha3 to k8s client support (#3350) * add gateway-api/apis/v1alpha3 to k8s client support Signed-off-by: shawnh2 * update AddToScheme to Install for all the gateway-api resources Signed-off-by: shawnh2 * address comments Signed-off-by: shawnh2 * fix name Signed-off-by: shawnh2 --------- Signed-off-by: shawnh2 --- internal/cmd/egctl/utils.go | 31 ++----------------- test/e2e/e2e_test.go | 11 ++----- test/e2e/embed.go | 22 ++++++++++++- .../e2e/merge_gateways/merge_gateways_test.go | 11 ++----- test/e2e/upgrade/eg_upgrade_test.go | 11 ++----- 5 files changed, 32 insertions(+), 54 deletions(-) diff --git a/internal/cmd/egctl/utils.go b/internal/cmd/egctl/utils.go index 254ebb94603..0ad50f27343 100644 --- a/internal/cmd/egctl/utils.go +++ b/internal/cmd/egctl/utils.go @@ -10,14 +10,10 @@ import ( adminv3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" "google.golang.org/protobuf/reflect/protoreflect" - "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - 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/envoygateway" ) type envoyConfigType string @@ -73,31 +69,8 @@ func findXDSResourceFromConfigDump(resourceType envoyConfigType, globalConfigs * return nil, fmt.Errorf("unknown resourceType %s", resourceType) } -// newGatewayScheme creates scheme for K8s Gateway API and Envoy Gateway. -func newGatewayScheme() (*runtime.Scheme, error) { - scheme := runtime.NewScheme() - - if err := gwv1.AddToScheme(scheme); err != nil { - return nil, err - } - if err := gwv1b1.AddToScheme(scheme); err != nil { - return nil, err - } - if err := gwv1a2.AddToScheme(scheme); err != nil { - return nil, err - } - if err := egv1a1.AddToScheme(scheme); err != nil { - return nil, err - } - - return scheme, nil -} - func newK8sClient() (client.Client, error) { - scheme, err := newGatewayScheme() - if err != nil { - return nil, fmt.Errorf("failed to load gateway shceme: %w", err) - } + scheme := envoygateway.GetScheme() cli, err := client.New(config.GetConfigOrDie(), client.Options{Scheme: scheme}) if err != nil { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 89e8cb4b19c..9f4f3353b64 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -17,14 +17,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - gwapiv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" - egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/test/e2e/tests" ) @@ -36,10 +32,9 @@ func TestE2E(t *testing.T) { c, err := client.New(cfg, client.Options{}) require.NoError(t, err) - require.NoError(t, gwapiv1a3.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1a2.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1.AddToScheme(c.Scheme())) - require.NoError(t, egv1a1.AddToScheme(c.Scheme())) + + // Install all the scheme for kubernetes client. + CheckInstallScheme(t, c) if flags.RunTest != nil && *flags.RunTest != "" { t.Logf("Running E2E test %s with %s GatewayClass\n cleanup: %t\n debug: %t", diff --git a/test/e2e/embed.go b/test/e2e/embed.go index 407645db014..6b5a891a43f 100644 --- a/test/e2e/embed.go +++ b/test/e2e/embed.go @@ -8,7 +8,27 @@ package e2e -import "embed" +import ( + "embed" + "testing" + + "github.com/stretchr/testify/require" + "sigs.k8s.io/controller-runtime/pkg/client" + gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" + gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gwapiv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" + + egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" +) //go:embed testdata/*.yaml base/* var Manifests embed.FS + +func CheckInstallScheme(t *testing.T, c client.Client) { + require.NoError(t, gwapiv1a3.Install(c.Scheme())) + require.NoError(t, gwapiv1a2.Install(c.Scheme())) + require.NoError(t, gwapiv1b1.Install(c.Scheme())) + require.NoError(t, gwapiv1.Install(c.Scheme())) + require.NoError(t, egv1a1.AddToScheme(c.Scheme())) +} diff --git a/test/e2e/merge_gateways/merge_gateways_test.go b/test/e2e/merge_gateways/merge_gateways_test.go index f994445087d..ca62bf19b60 100644 --- a/test/e2e/merge_gateways/merge_gateways_test.go +++ b/test/e2e/merge_gateways/merge_gateways_test.go @@ -17,15 +17,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - gwapiv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/kubernetes" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" - egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/test/e2e" "github.com/envoyproxy/gateway/test/e2e/tests" ) @@ -38,10 +34,9 @@ func TestMergeGateways(t *testing.T) { c, err := client.New(cfg, client.Options{}) require.NoError(t, err) - require.NoError(t, gwapiv1a3.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1a2.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1.AddToScheme(c.Scheme())) - require.NoError(t, egv1a1.AddToScheme(c.Scheme())) + + // Install all the scheme to kubernetes client. + e2e.CheckInstallScheme(t, c) if flags.RunTest != nil && *flags.RunTest != "" { t.Logf("Running E2E test %s with %s GatewayClass\n cleanup: %t\n debug: %t", diff --git a/test/e2e/upgrade/eg_upgrade_test.go b/test/e2e/upgrade/eg_upgrade_test.go index f366c6e7b0b..78a417cc179 100644 --- a/test/e2e/upgrade/eg_upgrade_test.go +++ b/test/e2e/upgrade/eg_upgrade_test.go @@ -17,14 +17,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - gwapiv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" - egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1" "github.com/envoyproxy/gateway/test/e2e" "github.com/envoyproxy/gateway/test/e2e/tests" ) @@ -37,10 +33,9 @@ func TestEGUpgrade(t *testing.T) { c, err := client.New(cfg, client.Options{}) require.NoError(t, err) - require.NoError(t, gwapiv1a3.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1a2.AddToScheme(c.Scheme())) - require.NoError(t, gwapiv1.AddToScheme(c.Scheme())) - require.NoError(t, egv1a1.AddToScheme(c.Scheme())) + + // Install all the scheme to kubernetes client. + e2e.CheckInstallScheme(t, c) if flags.RunTest != nil && *flags.RunTest != "" { t.Logf("Running E2E test %s with %s GatewayClass\n cleanup: %t\n debug: %t", From b90f81c09fe865bcac7e42f2349fa530b85482cc Mon Sep 17 00:00:00 2001 From: Harry Turton Date: Thu, 9 May 2024 09:23:58 +1000 Subject: [PATCH 2/8] feat(api): Add support for the header hash policy (#3342) * Make API changes Signed-off-by: Harry Turton * Add tests Signed-off-by: Harry Turton * Fixups Signed-off-by: Harry Turton * Fixup test compilation issues Signed-off-by: Harry Turton * Make ConsistentHash a union Signed-off-by: Harry Turton * Remove redundant TargetRef from tests Signed-off-by: Harry Turton * Revert test change Signed-off-by: Harry Turton * Add target ref back Signed-off-by: Harry Turton * Code review and fix tests Signed-off-by: Harry Turton * Regen charts Signed-off-by: Harry Turton * Propagate HeaderName to Header change to the json field Signed-off-by: Harry Turton * Generate code Signed-off-by: Harry Turton * Regen manifests Signed-off-by: Harry Turton * Add +notImplementedHide on Header Signed-off-by: Harry Turton --- api/v1alpha1/loadbalancer_types.go | 27 +++++++++-- api/v1alpha1/zz_generated.deepcopy.go | 22 ++++++++- ....envoyproxy.io_backendtrafficpolicies.yaml | 20 ++++++-- site/content/en/latest/api/extension_types.md | 22 +++++++-- .../backendtrafficpolicy_test.go | 47 +++++++++++++++++++ 5 files changed, 128 insertions(+), 10 deletions(-) diff --git a/api/v1alpha1/loadbalancer_types.go b/api/v1alpha1/loadbalancer_types.go index 3bd4d9c4e54..2a0fb21e515 100644 --- a/api/v1alpha1/loadbalancer_types.go +++ b/api/v1alpha1/loadbalancer_types.go @@ -18,7 +18,7 @@ type LoadBalancer struct { // "ConsistentHash", // "LeastRequest", // "Random", - // "RoundRobin", + // "RoundRobin". // // +unionDiscriminator Type LoadBalancerType `json:"type"` @@ -52,18 +52,39 @@ const ( ) // ConsistentHash defines the configuration related to the consistent hash -// load balancer policy +// load balancer policy. +// +union +// +// +kubebuilder:validation:XValidation:rule="self.type == 'Header' ? has(self.header) : !has(self.header)",message="If consistent hash type is header, the header field must be set." type ConsistentHash struct { + // Valid Type values are "SourceIP". + // + // +unionDiscriminator Type ConsistentHashType `json:"type"` + + // Header configures the header hash policy when the consistent hash type is set to Header. + // + // +optional + // +notImplementedHide + Header *Header `json:"header,omitempty"` +} + +// Header defines the header hashing configuration for consistent hash based +// load balancing. +type Header struct { + // Name of the header to hash. + Name string `json:"name"` } // ConsistentHashType defines the type of input to hash on. -// +kubebuilder:validation:Enum=SourceIP +// +kubebuilder:validation:Enum=SourceIP;Header type ConsistentHashType string const ( // SourceIPConsistentHashType hashes based on the source IP address. SourceIPConsistentHashType ConsistentHashType = "SourceIP" + // HeaderConsistentHashType hashes based on a request header. + HeaderConsistentHashType ConsistentHashType = "Header" ) // SlowStart defines the configuration related to the slow start load balancer policy. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 8ebd4453c5c..71f09022f35 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -751,6 +751,11 @@ func (in *ConnectionLimit) DeepCopy() *ConnectionLimit { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsistentHash) DeepCopyInto(out *ConsistentHash) { *out = *in + if in.Header != nil { + in, out := &in.Header, &out.Header + *out = new(Header) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsistentHash. @@ -2225,6 +2230,21 @@ func (in *HTTPWasmCodeSource) DeepCopy() *HTTPWasmCodeSource { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Header) DeepCopyInto(out *Header) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Header. +func (in *Header) DeepCopy() *Header { + if in == nil { + return nil + } + out := new(Header) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HeaderMatch) DeepCopyInto(out *HeaderMatch) { *out = *in @@ -2865,7 +2885,7 @@ func (in *LoadBalancer) DeepCopyInto(out *LoadBalancer) { if in.ConsistentHash != nil { in, out := &in.ConsistentHash, &out.ConsistentHash *out = new(ConsistentHash) - **out = **in + (*in).DeepCopyInto(*out) } if in.SlowStart != nil { in, out := &in.SlowStart, &out.SlowStart diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml index eb8457a116b..ba195c65408 100644 --- a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml +++ b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml @@ -412,15 +412,29 @@ spec: ConsistentHash defines the configuration when the load balancer type is set to ConsistentHash properties: + header: + description: Header configures the header hash policy when + the consistent hash type is set to Header. + properties: + name: + description: Name of the header to hash. + type: string + required: + - name + type: object type: - description: ConsistentHashType defines the type of input - to hash on. + description: Valid Type values are "SourceIP". enum: - SourceIP + - Header type: string required: - type type: object + x-kubernetes-validations: + - message: If consistent hash type is header, the header field + must be set. + rule: 'self.type == ''Header'' ? has(self.header) : !has(self.header)' slowStart: description: |- SlowStart defines the configuration related to the slow start load balancer policy. @@ -444,7 +458,7 @@ spec: "ConsistentHash", "LeastRequest", "Random", - "RoundRobin", + "RoundRobin". enum: - ConsistentHash - LeastRequest diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index c00e9d8a915..cb74c44f487 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -555,14 +555,14 @@ _Appears in:_ ConsistentHash defines the configuration related to the consistent hash -load balancer policy +load balancer policy. _Appears in:_ - [LoadBalancer](#loadbalancer) | Field | Type | Required | Description | | --- | --- | --- | --- | -| `type` | _[ConsistentHashType](#consistenthashtype)_ | true | | +| `type` | _[ConsistentHashType](#consistenthashtype)_ | true | Valid Type values are "SourceIP". | #### ConsistentHashType @@ -577,6 +577,7 @@ _Appears in:_ | Value | Description | | ----- | ----------- | | `SourceIP` | SourceIPConsistentHashType hashes based on the source IP address.
| +| `Header` | HeaderConsistentHashType hashes based on a request header.
| #### CustomHeaderExtensionSettings @@ -1624,6 +1625,21 @@ _Appears in:_ | `url` | _string_ | true | URL is the URL containing the wasm code. | +#### Header + + + +Header defines the header hashing configuration for consistent hash based +load balancing. + +_Appears in:_ +- [ConsistentHash](#consistenthash) + +| Field | Type | Required | Description | +| --- | --- | --- | --- | +| `name` | _string_ | true | Name of the header to hash. | + + #### HeaderMatchType @@ -2018,7 +2034,7 @@ _Appears in:_ | Field | Type | Required | Description | | --- | --- | --- | --- | -| `type` | _[LoadBalancerType](#loadbalancertype)_ | true | Type decides the type of Load Balancer policy.
Valid LoadBalancerType values are
"ConsistentHash",
"LeastRequest",
"Random",
"RoundRobin", | +| `type` | _[LoadBalancerType](#loadbalancertype)_ | true | Type decides the type of Load Balancer policy.
Valid LoadBalancerType values are
"ConsistentHash",
"LeastRequest",
"Random",
"RoundRobin". | | `consistentHash` | _[ConsistentHash](#consistenthash)_ | false | ConsistentHash defines the configuration when the load balancer type is
set to ConsistentHash | | `slowStart` | _[SlowStart](#slowstart)_ | false | SlowStart defines the configuration related to the slow start load balancer policy.
If set, during slow start window, traffic sent to the newly added hosts will gradually increase.
Currently this is only supported for RoundRobin and LeastRequest load balancers | diff --git a/test/cel-validation/backendtrafficpolicy_test.go b/test/cel-validation/backendtrafficpolicy_test.go index a1dd7ac7eb7..187fae39929 100644 --- a/test/cel-validation/backendtrafficpolicy_test.go +++ b/test/cel-validation/backendtrafficpolicy_test.go @@ -194,6 +194,53 @@ func TestBackendTrafficPolicyTarget(t *testing.T) { "spec.loadBalancer: Invalid value: \"object\": If LoadBalancer type is consistentHash, consistentHash field needs to be set", }, }, + { + desc: "consistentHash header field not nil when consistentHashType is header", + mutate: func(btp *egv1a1.BackendTrafficPolicy) { + btp.Spec = egv1a1.BackendTrafficPolicySpec{ + TargetRef: gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{ + LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{ + Group: gwapiv1a2.Group("gateway.networking.k8s.io"), + Kind: gwapiv1a2.Kind("Gateway"), + Name: gwapiv1a2.ObjectName("eg"), + }, + }, + LoadBalancer: &egv1a1.LoadBalancer{ + Type: egv1a1.ConsistentHashLoadBalancerType, + ConsistentHash: &egv1a1.ConsistentHash{ + Type: "Header", + Header: &egv1a1.Header{ + Name: "name", + }, + }, + }, + } + }, + wantErrors: []string{}, + }, + { + desc: "consistentHash header field nil when consistentHashType is header", + mutate: func(btp *egv1a1.BackendTrafficPolicy) { + btp.Spec = egv1a1.BackendTrafficPolicySpec{ + TargetRef: gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{ + LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{ + Group: gwapiv1a2.Group("gateway.networking.k8s.io"), + Kind: gwapiv1a2.Kind("Gateway"), + Name: gwapiv1a2.ObjectName("eg"), + }, + }, + LoadBalancer: &egv1a1.LoadBalancer{ + Type: egv1a1.ConsistentHashLoadBalancerType, + ConsistentHash: &egv1a1.ConsistentHash{ + Type: "Header", + }, + }, + } + }, + wantErrors: []string{ + "spec.loadBalancer.consistentHash: Invalid value: \"object\": If consistent hash type is header, the header field must be set", + }, + }, { desc: "leastRequest with ConsistentHash nil", mutate: func(btp *egv1a1.BackendTrafficPolicy) { From bab79b0de6d6444d53e7239faf8b93e72776e6ed Mon Sep 17 00:00:00 2001 From: zirain Date: Thu, 9 May 2024 09:08:41 +0800 Subject: [PATCH 3/8] Bump Gateway API v1.1.0 (#3356) Signed-off-by: zirain --- charts/gateway-helm/crds/gatewayapi-crds.yaml | 20 +++++++++---------- go.mod | 2 +- go.sum | 4 ++-- .../translate/out/default-resources.all.yaml | 2 -- .../out/echo-gateway-api.cluster.yaml | 1 - .../translate/out/echo-gateway-api.route.json | 3 +-- .../translate/out/invalid-envoyproxy.all.yaml | 2 -- .../translate/out/quickstart.all.yaml | 1 - .../out/rejected-http-route.route.yaml | 1 - .../translate/out/valid-envoyproxy.all.yaml | 2 -- .../backendtlspolicy-ca-only.out.yaml | 1 - .../backendtlspolicy-default-ns.out.yaml | 1 - .../backendtlspolicy-invalid-ca.out.yaml | 1 - ...ackendtlspolicy-system-truststore.out.yaml | 1 - ...dtlspolicy-without-referencegrant.out.yaml | 1 - ...endtrafficpolicy-override-replace.out.yaml | 2 -- ...ndtrafficpolicy-status-conditions.out.yaml | 3 --- ...fficpolicy-status-fault-injection.out.yaml | 3 --- ...trafficpolicy-use-client-protocol.out.yaml | 1 - ...policy-with-circuitbreakers-error.out.yaml | 3 --- ...rafficpolicy-with-circuitbreakers.out.yaml | 2 -- ...endtrafficpolicy-with-healthcheck.out.yaml | 4 ---- ...ndtrafficpolicy-with-loadbalancer.out.yaml | 3 --- ...telimit-default-route-level-limit.out.yaml | 1 - ...ocal-ratelimit-invalid-limit-unit.out.yaml | 1 - ...ocal-ratelimit-invalid-match-type.out.yaml | 1 - ...valid-multiple-route-level-limits.out.yaml | 1 - ...rafficpolicy-with-local-ratelimit.out.yaml | 1 - ...dtrafficpolicy-with-proxyprotocol.out.yaml | 2 -- ...licy-with-ratelimit-invalid-regex.out.yaml | 1 - ...ckendtrafficpolicy-with-ratelimit.out.yaml | 2 -- ...backendtrafficpolicy-with-retries.out.yaml | 2 -- ...olicy-with-same-prefix-httproutes.out.yaml | 2 -- ...ndtrafficpolicy-with-tcpkeepalive.out.yaml | 2 -- ...dtrafficpolicy-with-timeout-error.out.yaml | 1 - ...backendtrafficpolicy-with-timeout.out.yaml | 2 -- .../clienttrafficpolicy-http3.out.yaml | 1 - .../testdata/conflicting-policies.out.yaml | 2 -- .../testdata/custom-filter-order.out.yaml | 1 - ...yextensionpolicy-override-replace.out.yaml | 2 -- ...extensionpolicy-status-conditions.out.yaml | 3 --- ...-extproc-invalid-no-matching-port.out.yaml | 1 - ...licy-with-extproc-invalid-no-port.out.yaml | 1 - ...xtproc-invalid-no-reference-grant.out.yaml | 1 - ...y-with-extproc-invalid-no-service.out.yaml | 1 - ...ith-extproc-with-backendtlspolicy.out.yaml | 2 -- ...extproc-with-multiple-backendrefs.out.yaml | 2 -- .../envoyextensionpolicy-with-wasm.out.yaml | 2 -- .../testdata/envoyproxy-tls-settings.out.yaml | 1 - ...th-extension-filter-invalid-group.out.yaml | 1 - ...ith-non-matching-extension-filter.out.yaml | 1 - ...with-unsupported-extension-filter.out.yaml | 1 - ...route-with-valid-extension-filter.out.yaml | 1 - ...-namespace-with-allowed-httproute.out.yaml | 1 - ...mespace-with-disallowed-httproute.out.yaml | 1 - .../testdata/gateway-infrastructure.out.yaml | 1 - ...valid-allowed-namespaces-selector.out.yaml | 1 - ...with-invalid-allowed-routes-group.out.yaml | 1 - ...allowed-routes-kind-and-supported.out.yaml | 1 - ...-with-invalid-allowed-routes-kind.out.yaml | 1 - ...nvalid-multiple-tls-configuration.out.yaml | 1 - ...id-tls-configuration-invalid-mode.out.yaml | 1 - ...configuration-no-certificate-refs.out.yaml | 1 - ...ion-no-valid-certificate-for-fqdn.out.yaml | 1 - ...nfiguration-secret-does-not-exist.out.yaml | 1 - ...uration-secret-in-other-namespace.out.yaml | 1 - ...configuration-secret-is-not-valid.out.yaml | 1 - ...ssing-allowed-namespaces-selector.out.yaml | 1 - ...her-namespace-allowed-by-refgrant.out.yaml | 1 - ...ith-tls-terminate-and-passthrough.out.yaml | 1 - ...istener-with-unsupported-protocol.out.yaml | 1 - ...ith-same-algorithm-different-fqdn.out.yaml | 1 - ...-valid-multiple-tls-configuration.out.yaml | 1 - ...ener-with-valid-tls-configuration.out.yaml | 1 - ...with-preexisting-status-condition.out.yaml | 1 - ...teway-with-stale-status-condition.out.yaml | 1 - ...d-tlsroute-same-hostname-and-port.out.yaml | 1 - ...isteners-with-multiple-httproutes.out.yaml | 2 -- ...eners-with-same-port-and-hostname.out.yaml | 1 - ...me-port-and-incompatible-protocol.out.yaml | 1 - ...-with-same-port-http-tcp-protocol.out.yaml | 1 - ...-with-same-port-http-udp-protocol.out.yaml | 1 - .../grpcroute-with-empty-backends.out.yaml | 1 - .../grpcroute-with-header-match.out.yaml | 1 - ...ute-with-method-and-service-match.out.yaml | 1 - .../grpcroute-with-method-match.out.yaml | 1 - ...oute-with-request-header-modifier.out.yaml | 1 - .../grpcroute-with-service-match.out.yaml | 1 - ...dtrafficpolicy-with-timeout-error.out.yaml | 1 - ...backendtrafficpolicy-with-timeout.out.yaml | 2 -- ...way-with-more-different-listeners.out.yaml | 1 - ...ng-to-gateway-with-more-listeners.out.yaml | 1 - ...wo-listeners-with-different-ports.out.yaml | 1 - ...ing-to-gateway-with-two-listeners.out.yaml | 1 - .../httproute-attaching-to-gateway.out.yaml | 1 - ...taching-to-listener-matching-port.out.yaml | 1 - ...ner-on-gateway-with-two-listeners.out.yaml | 1 - ...ort-backendrefs-diff-address-type.out.yaml | 1 - ...ort-backendrefs-same-address-type.out.yaml | 1 - ...port-backendref-fqdn-address-type.out.yaml | 1 - ...ort-backendref-mixed-address-type.out.yaml | 1 - ...ner-with-serviceimport-backendref.out.yaml | 1 - .../httproute-attaching-to-listener.out.yaml | 1 - ...httproute-backend-request-timeout.out.yaml | 1 - ...ing-to-listener-non-matching-port.out.yaml | 1 - .../httproute-request-timeout.out.yaml | 1 - ...ith-empty-backends-and-no-filters.out.yaml | 1 - ...-multiple-backends-and-no-weights.out.yaml | 1 - ...ith-multiple-backends-and-weights.out.yaml | 1 - ...her-namespace-allowed-by-refgrant.out.yaml | 1 - ...her-namespace-allowed-by-refgrant.out.yaml | 1 - .../httproute-with-empty-matches.out.yaml | 1 - ...er-duplicate-add-multiple-filters.out.yaml | 1 - ...with-header-filter-duplicate-adds.out.yaml | 1 - ...duplicate-remove-multiple-filters.out.yaml | 1 - ...h-header-filter-duplicate-removes.out.yaml | 1 - ...header-filter-empty-header-values.out.yaml | 1 - ...-with-header-filter-empty-headers.out.yaml | 1 - ...ith-header-filter-invalid-headers.out.yaml | 1 - ...ute-with-header-filter-no-headers.out.yaml | 1 - ...th-header-filter-no-valid-headers.out.yaml | 1 - ...tproute-with-header-filter-remove.out.yaml | 1 - ...with-invalid-backend-ref-bad-port.out.yaml | 1 - ...invalid-backend-ref-invalid-group.out.yaml | 1 - ...-invalid-backend-ref-invalid-kind.out.yaml | 1 - ...-with-invalid-backend-ref-no-port.out.yaml | 1 - ...lid-backend-ref-no-service.import.out.yaml | 1 - ...th-invalid-backend-ref-no-service.out.yaml | 1 - ...id-backend-ref-unsupported-filter.out.yaml | 1 - ...lid-backendref-in-other-namespace.out.yaml | 1 - .../httproute-with-invalid-regex.out.yaml | 1 - ...ute-with-mirror-filter-duplicates.out.yaml | 1 - ...route-with-mirror-filter-multiple.out.yaml | 1 - ...ith-mirror-filter-service-no-port.out.yaml | 1 - ...h-mirror-filter-service-not-found.out.yaml | 1 - .../httproute-with-mirror-filter.out.yaml | 1 - ...to-gateway-with-wildcard-hostname.out.yaml | 1 - ...ct-filter-full-path-replace-https.out.yaml | 1 - ...ute-with-redirect-filter-hostname.out.yaml | 1 - ...direct-filter-invalid-filter-type.out.yaml | 1 - ...th-redirect-filter-invalid-scheme.out.yaml | 1 - ...th-redirect-filter-invalid-status.out.yaml | 1 - ...ter-prefix-replace-with-port-http.out.yaml | 1 - ...-with-response-header-filter-adds.out.yaml | 1 - ...er-duplicate-add-multiple-filters.out.yaml | 1 - ...onse-header-filter-duplicate-adds.out.yaml | 1 - ...duplicate-remove-multiple-filters.out.yaml | 1 - ...e-header-filter-duplicate-removes.out.yaml | 1 - ...header-filter-empty-header-values.out.yaml | 1 - ...ponse-header-filter-empty-headers.out.yaml | 1 - ...nse-header-filter-invalid-headers.out.yaml | 1 - ...response-header-filter-no-headers.out.yaml | 1 - ...se-header-filter-no-valid-headers.out.yaml | 1 - ...ith-response-header-filter-remove.out.yaml | 1 - ...single-rule-with-exact-path-match.out.yaml | 1 - ...ingle-rule-with-http-method-match.out.yaml | 1 - ...h-single-rule-with-multiple-rules.out.yaml | 3 --- ...h-prefix-and-exact-header-matches.out.yaml | 1 - ...e-invalid-backend-refs-no-service.out.yaml | 1 - ...to-gateway-with-wildcard-hostname.out.yaml | 1 - ...to-gateway-with-wildcard-hostname.out.yaml | 1 - ...ite-filter-full-path-replace-http.out.yaml | 1 - ...te-filter-hostname-prefix-replace.out.yaml | 1 - ...e-with-urlrewrite-filter-hostname.out.yaml | 1 - ...ewrite-filter-invalid-filter-type.out.yaml | 1 - ...rlrewrite-filter-invalid-hostname.out.yaml | 1 - ...e-filter-invalid-multiple-filters.out.yaml | 1 - ...lrewrite-filter-invalid-path-type.out.yaml | 1 - ...th-urlrewrite-filter-invalid-path.out.yaml | 1 - ...th-urlrewrite-filter-missing-path.out.yaml | 1 - ...ewrite-filter-prefix-replace-http.out.yaml | 1 - ...ng-to-gateway-with-unset-hostname.out.yaml | 1 - .../httproutes-with-multiple-matches.out.yaml | 6 ------ ...multiple-gateways-multiple-routes.out.yaml | 2 -- .../merge-with-isolated-policies-2.out.yaml | 4 ---- .../merge-with-isolated-policies.out.yaml | 2 -- .../securitypolicy-override-replace.out.yaml | 2 -- .../securitypolicy-status-conditions.out.yaml | 2 -- .../securitypolicy-with-basic-auth.out.yaml | 3 --- .../securitypolicy-with-cors.out.yaml | 3 --- ...-extauth-invalid-no-matching-port.out.yaml | 1 - ...licy-with-extauth-invalid-no-port.out.yaml | 1 - ...xtauth-invalid-no-reference-grant.out.yaml | 1 - ...y-with-extauth-invalid-no-service.out.yaml | 1 - ...ith-extauth-with-backendtlspolicy.out.yaml | 2 -- .../securitypolicy-with-extauth.out.yaml | 3 --- ...ypolicy-with-jwt-and-invalid-oidc.out.yaml | 2 -- .../securitypolicy-with-jwt-optional.out.yaml | 2 -- ...cy-with-jwt-with-custom-extractor.out.yaml | 2 -- .../testdata/securitypolicy-with-jwt.out.yaml | 2 -- .../securitypolicy-with-oidc.out.yaml | 2 -- .../tracing-merged-multiple-routes.out.yaml | 2 -- .../testdata/tracing-multiple-routes.out.yaml | 2 -- 193 files changed, 14 insertions(+), 263 deletions(-) diff --git a/charts/gateway-helm/crds/gatewayapi-crds.yaml b/charts/gateway-helm/crds/gatewayapi-crds.yaml index 8d327884535..8a50a1fa26a 100644 --- a/charts/gateway-helm/crds/gatewayapi-crds.yaml +++ b/charts/gateway-helm/crds/gatewayapi-crds.yaml @@ -24,7 +24,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: backendlbpolicies.gateway.networking.k8s.io @@ -581,7 +581,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null labels: @@ -1185,7 +1185,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io @@ -1737,7 +1737,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gateways.gateway.networking.k8s.io @@ -4223,7 +4223,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: grpcroutes.gateway.networking.k8s.io @@ -8909,7 +8909,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: httproutes.gateway.networking.k8s.io @@ -15389,7 +15389,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: referencegrants.gateway.networking.k8s.io @@ -15776,7 +15776,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tcproutes.gateway.networking.k8s.io @@ -16601,7 +16601,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tlsroutes.gateway.networking.k8s.io @@ -17499,7 +17499,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2997 - gateway.networking.k8s.io/bundle-version: v1.1.0-rc2 + gateway.networking.k8s.io/bundle-version: v1.1.0 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: udproutes.gateway.networking.k8s.io diff --git a/go.mod b/go.mod index b928d00b108..79d26be8cb7 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( k8s.io/kubectl v0.30.0 k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 sigs.k8s.io/controller-runtime v0.18.1 - sigs.k8s.io/gateway-api v1.1.0-rc2 + sigs.k8s.io/gateway-api v1.1.0 sigs.k8s.io/mcs-api v0.1.0 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index f0b252fc375..58573d20d27 100644 --- a/go.sum +++ b/go.sum @@ -980,8 +980,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE sigs.k8s.io/controller-runtime v0.18.1 h1:RpWbigmuiylbxOCLy0tGnq1cU1qWPwNIQzoJk+QeJx4= sigs.k8s.io/controller-runtime v0.18.1/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/gateway-api v1.1.0-rc2 h1:uMHSylqzNHYD4kgp6OCDZv9o7ukzgtjuI6G6/e+TSUo= -sigs.k8s.io/gateway-api v1.1.0-rc2/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= +sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= +sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4= diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 11a124f387c..7b8319b6376 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -322,7 +322,6 @@ grpcRoutes: - method: method: DoThing service: com.example.Things - sessionPersistence: null status: parents: - conditions: @@ -362,7 +361,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml index 4506e5f7bab..3d88f20f51d 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml @@ -70,7 +70,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json index 0dbd6eb6a37..41dfd6683e7 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json @@ -115,8 +115,7 @@ "port": 3000, "weight": 1 } - ], - "sessionPersistence": null + ] } ] }, diff --git a/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml b/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml index 07bfeb1a95a..c7ad9cde133 100644 --- a/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml @@ -202,7 +202,6 @@ grpcRoutes: - method: method: DoThing service: com.example.Things - sessionPersistence: null status: parents: - conditions: @@ -242,7 +241,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml index e9f3058be76..3ea1f3f2bc7 100644 --- a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml @@ -56,7 +56,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml b/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml index 9f550da41dd..c578d14aef5 100644 --- a/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml @@ -63,7 +63,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml b/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml index 818dba2b03b..ef42d68c93e 100644 --- a/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml @@ -195,7 +195,6 @@ grpcRoutes: - method: method: DoThing service: com.example.Things - sessionPersistence: null status: parents: - conditions: @@ -235,7 +234,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml index 6fb63ad96a5..c802acac89a 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -92,7 +92,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml index 1075be15e75..63ea3f98192 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -92,7 +92,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml index 0a991b985c4..818edfc8994 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -92,7 +92,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml index bb6f84a8919..1fdb9af1170 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -89,7 +89,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml index 975eca74e57..0df8e3e1b4a 100755 --- a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml @@ -93,7 +93,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml index eec0eef7a45..b6cf931638c 100755 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -130,7 +130,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -169,7 +168,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml index 00ffdeb9cf7..41088add2e6 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -376,7 +376,6 @@ grpcRoutes: - name: magic type: Exact value: foo - sessionPersistence: null status: parents: - conditions: @@ -412,7 +411,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -447,7 +445,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml index 4ff9353ca0d..7d786784105 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml @@ -197,7 +197,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -237,7 +236,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -276,7 +274,6 @@ httpRoutes: matches: - path: value: /route2 - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml index 852830593ac..5711eea324e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml @@ -87,7 +87,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml index a6bafa1554d..d76081d3a98 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml @@ -179,7 +179,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -219,7 +218,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -258,7 +256,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml index 5eb2af5c093..aa471f54709 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml @@ -159,7 +159,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -199,7 +198,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml index 13bd67d0bbb..b49ec2daf65 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml @@ -291,7 +291,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -331,7 +330,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -370,7 +368,6 @@ httpRoutes: matches: - path: value: /v2 - sessionPersistence: null status: parents: - conditions: @@ -409,7 +406,6 @@ httpRoutes: matches: - path: value: /v3 - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index c7113bd1252..d308794c035 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -218,7 +218,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -258,7 +257,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -297,7 +295,6 @@ httpRoutes: matches: - path: value: /test2 - sessionPersistence: null status: parents: - conditions: 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 76098c166c2..dcd8184887d 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 @@ -110,7 +110,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 047e9b3bfd1..97090bd582f 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 @@ -114,7 +114,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 2a1053b4cbf..65c647c9a11 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 @@ -110,7 +110,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e1a5e808d23..64b71093d9f 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 @@ -117,7 +117,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml index b9a04a2f22c..b331cd6fa82 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -113,7 +113,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml index 66668308089..8e6332a019e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml @@ -151,7 +151,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -191,7 +190,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 36b1e01e52d..3f240552f4a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -96,7 +96,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index b0be3b80718..d3d6c8eb53a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -171,7 +171,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -211,7 +210,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml index fc515a1f5c6..ae83655a6a1 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml @@ -170,7 +170,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -210,7 +209,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8a8cdd28dfd..c9a22a8334c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -91,7 +91,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -130,7 +129,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml index 39754199ae2..eb796b42f56 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml @@ -155,7 +155,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -195,7 +194,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml index 210a3c66b6f..01871b5578f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -87,7 +87,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml index 12b72a9e4d3..27ed1f54077 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml @@ -159,7 +159,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -199,7 +198,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml index 40a3cb49ebb..eb7503a4b31 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -90,7 +90,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/conflicting-policies.out.yaml b/internal/gatewayapi/testdata/conflicting-policies.out.yaml index b7cd684dc05..9bb89edf906 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -132,7 +132,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: @@ -176,7 +175,6 @@ httpRoutes: - path: type: PathPrefix value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/custom-filter-order.out.yaml b/internal/gatewayapi/testdata/custom-filter-order.out.yaml index 3ce5e39b67f..aac42e9966c 100755 --- a/internal/gatewayapi/testdata/custom-filter-order.out.yaml +++ b/internal/gatewayapi/testdata/custom-filter-order.out.yaml @@ -107,7 +107,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml index d5784cbd780..7b2e5dce6d1 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml @@ -126,7 +126,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -165,7 +164,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml index 406518cdedf..a4ed5badfde 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml @@ -376,7 +376,6 @@ grpcRoutes: - name: magic type: Exact value: foo - sessionPersistence: null status: parents: - conditions: @@ -412,7 +411,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -447,7 +445,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml index 84c324dee2a..209fd00dc20 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml @@ -90,7 +90,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml index 8f5e97c7f86..65ca50c9cc4 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml @@ -90,7 +90,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml index b69c1fb0fbd..49b831c2def 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml @@ -92,7 +92,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml index 0f76696a927..5c730909e6d 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml @@ -91,7 +91,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml index 1298a770452..a85f3205e70 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml @@ -202,7 +202,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -241,7 +240,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml index 1c863229baf..1a5eb4604c9 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml @@ -127,7 +127,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -166,7 +165,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml index c563f6ee6eb..f248162b5a3 100755 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml @@ -153,7 +153,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -192,7 +191,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml index 0448f8cdcec..6408f39b790 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml @@ -86,7 +86,6 @@ httpRoutes: - name: https-backend namespace: default port: 443 - sessionPersistence: null status: parents: - conditions: 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 7d6ad143aa9..0607032af8f 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 d2285055196..0a691324cda 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 0cf518ac3f2..2f8e19d300e 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 3f39a6b2267..ed697a91ad0 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 f720416c86b..7ec08cdd2c8 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 @@ -57,7 +57,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 125aec09f25..e04a9abcc61 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 @@ -57,7 +57,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml index d20af809b03..2cca7a21513 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -70,7 +70,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 f1c9f724819..6525ecfc32e 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 4bfec1c940a..182b2b17313 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 @@ -51,7 +51,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 5592c3019e8..a21d579d0e8 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 @@ -53,7 +53,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 186f7acbe9b..460da331ff4 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 @@ -51,7 +51,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8b3e18f47d8..d503d2875cb 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 @@ -66,7 +66,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 30c07b262fa..f5b1bd561dd 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 @@ -59,7 +59,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 ca3eb454062..84dd3118e90 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 @@ -54,7 +54,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 778bf57b589..d67fa87f9b6 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 @@ -61,7 +61,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 5d981db7089..cac358ab651 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 @@ -58,7 +58,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 6b0202d4695..3c27f730a57 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 004cab611f0..72c30d42149 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 @@ -58,7 +58,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 1bfafa84126..2e8f83dbaf9 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 @@ -53,7 +53,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 ea56f5e0503..a501e2a7ccd 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 @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 12fadd79667..8b6f602c543 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 @@ -94,7 +94,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 453dbdd3060..123a0171cb6 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 @@ -53,7 +53,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 994a353b5c5..e197d01d60b 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 @@ -66,7 +66,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 93fbb690e7f..e9534d5bd7b 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 @@ -66,7 +66,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 a7ee12a5649..cdc613c4a9a 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 @@ -63,7 +63,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 6b9f68c11c1..aefd53705de 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -57,7 +57,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8e697e48eff..acb517c5b82 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -63,7 +63,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 ebcec620f83..dfe1d49dc37 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 @@ -88,7 +88,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 9645705ec48..e43457681d5 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 @@ -88,7 +88,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -123,7 +122,6 @@ httpRoutes: matches: - path: value: /test - sessionPersistence: null status: parents: - conditions: 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 5c8cc89b5aa..bf051ef6c79 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 @@ -88,7 +88,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 fdd5efd90df..acbd772d0f6 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 @@ -88,7 +88,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8ab5d79f575..3dc939e6f55 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 @@ -85,7 +85,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 b794998a690..7ac4c4e14b3 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 @@ -85,7 +85,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml index 220dc1ca432..23d899faad6 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -56,7 +56,6 @@ grpcRoutes: - method: service: com.ExampleExact type: Exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index a663c9d9b91..2c5ecc13bf0 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -60,7 +60,6 @@ grpcRoutes: - name: magic type: Exact value: foo - sessionPersistence: null status: parents: - conditions: 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 b432a28b038..eb7ce849a96 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 @@ -64,7 +64,6 @@ grpcRoutes: method: Foobar service: foo.* type: RegularExpression - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 67e1e718afa..82a2584d195 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -62,7 +62,6 @@ grpcRoutes: - method: method: FooBar[0-9]+ type: RegularExpression - sessionPersistence: null status: parents: - conditions: 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 2bdc75396bc..ad5e96b684b 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -61,7 +61,6 @@ grpcRoutes: - name: my-header value: foo type: RequestHeaderModifier - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index f1370181e05..aa2ef46b259 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -62,7 +62,6 @@ grpcRoutes: - method: service: com.[A-Z]+ type: RegularExpression - sessionPersistence: null status: parents: - conditions: 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 4e0692bce7a..b6093872e45 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 @@ -92,7 +92,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null timeouts: request: 1s status: 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 97060b16a2e..2f060c2db49 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml @@ -158,7 +158,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -198,7 +197,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null timeouts: request: 1s status: 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 0e8ebf56128..197503b51c5 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 @@ -268,7 +268,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 4ad3cd050ab..1c238cdf039 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 @@ -268,7 +268,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 306a51773ae..e16ff66b0ea 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 @@ -92,7 +92,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 4b07cb89f8c..1d39beaf5e7 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 @@ -88,7 +88,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 79894ea62c0..352a6da41a5 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -57,7 +57,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 a32ad8b8b59..6ddbd88af2a 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 @@ -59,7 +59,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e2dbac7a7c8..3e2ef78a015 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 @@ -89,7 +89,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8d99f3721b2..e2a3401c217 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 @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 7a36c8edcd9..a1e080d6482 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 @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 315b6035cc1..134162f6b5c 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8a4a5708a91..8a3c4a0587a 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 830c09ae44a..c1bb62b6797 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index da28b843d1a..0d0d1755ef4 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -58,7 +58,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index ebca1dc84cb..f56835ccb2e 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -58,7 +58,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null timeouts: backendRequest: 1s status: 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 74d6a60e23b..e7474693b36 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 @@ -59,7 +59,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index c8b7ed44385..3d3f73076ee 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -58,7 +58,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null timeouts: request: 5s status: 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 70ff286d301..6a99fbe90e3 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 @@ -54,7 +54,6 @@ httpRoutes: - matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 0d8dbfcafbe..8a8b799c552 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 @@ -61,7 +61,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 1e7b1c19d13..b962d108c8b 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 b79309da483..a170bf0e21f 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 @@ -59,7 +59,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 cbd5462a3bc..2501f9d8c20 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 @@ -61,7 +61,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index f804cf23445..d345186e64c 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -55,7 +55,6 @@ httpRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: 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 51e4384374f..d1b3c41b858 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 @@ -76,7 +76,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 08cf9499f1c..ec57fd25d09 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 @@ -86,7 +86,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 b4b013cc2df..c290d1a96c5 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e6601bfb3ad..d6d97d8e7d4 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 30b37bf854a..c74c9294dab 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 @@ -70,7 +70,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 929edefe2c5..5065aa523df 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 680d319b225..93f152ffea8 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 65688a9a41f..d06a9820f7a 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 @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 ea43a60f2bd..3329848de05 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 bded3d891b1..f0e08c90108 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 a18355c2e64..d976cb93f38 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 @@ -58,7 +58,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 97c7aad4334..fe064903ada 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 @@ -60,7 +60,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 ceed40de337..bee00784ac7 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 @@ -59,7 +59,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 bf978848d56..417f53c7dfb 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 @@ -57,7 +57,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 51372057d42..a6c22425e84 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 @@ -60,7 +60,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 a0dcd08d937..2bf53591ed3 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 @@ -58,7 +58,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 40e65a2f8e2..26c803f9d91 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 @@ -64,7 +64,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 5aa2f3b4bf9..cc0cc881a87 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 @@ -59,7 +59,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml index 926080b94f6..a8e06b4fa54 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml @@ -98,7 +98,6 @@ httpRoutes: - path: type: RegularExpression value: '*.foo.bar.com' - sessionPersistence: null status: parents: - conditions: 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 09abe4aa790..8ed5fe11eff 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -74,7 +74,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 a83dd355382..425bebf34b3 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -86,7 +86,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 c32c9b1cb2c..60b599dcdd7 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 f3099777fec..724d00e1ecc 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index abcaef49993..d98e16bd4d3 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 096cc52e907..ebe71a52556 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 c82dcef2071..c1f9030ef3c 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 @@ -66,7 +66,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 6d21d6cac99..0cc17703e29 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 d6fc90e7159..a7a57501a4e 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 19e1652557e..c408f51ffb5 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 @@ -63,7 +63,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 ab8c4747024..99c291b14ae 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 @@ -63,7 +63,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 24618e0df2c..bb9d2644130 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 cab37a40e49..b3625b41e1a 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 @@ -82,7 +82,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 9c800f170d0..05f34deb133 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 @@ -76,7 +76,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 41895ef3ab0..6c95d3dbc5f 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 @@ -86,7 +86,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 42dcb03960a..3183508ec02 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 77156ae3d43..e20ab6f52fc 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 75149d48e14..4de5380a305 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 @@ -70,7 +70,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 92156218b1f..c0a449536bd 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 135d21fef14..14f957bb880 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 @@ -72,7 +72,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e2a6e66ccfd..41667e93380 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 @@ -64,7 +64,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 36df78d7342..2ee89577ab9 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 6ef2d9914fe..4e06010a1a2 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 80a119f1897..9f7d91d4ec7 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 @@ -58,7 +58,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 d92fb4b035e..55059d9d6ee 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 @@ -56,7 +56,6 @@ httpRoutes: port: 8080 matches: - method: POST - sessionPersistence: null status: parents: - conditions: 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 83b7a6ef1a7..7cae3475b67 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 @@ -66,7 +66,6 @@ httpRoutes: - name: QueryParam-1 type: Exact value: exact - sessionPersistence: null - backendRefs: - name: service-2 port: 8080 @@ -74,7 +73,6 @@ httpRoutes: - path: type: PathPrefix value: /prefix - sessionPersistence: null - backendRefs: - name: service-3 port: 8080 @@ -90,7 +88,6 @@ httpRoutes: - name: QueryParam-1 type: RegularExpression value: '*regex*' - sessionPersistence: null status: parents: - conditions: 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 2e539164861..f48725ca3ce 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 @@ -62,7 +62,6 @@ httpRoutes: value: Val-2 path: value: /pathprefix - sessionPersistence: null status: parents: - conditions: 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 f514cf8eb8e..da444284df0 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 @@ -62,7 +62,6 @@ httpRoutes: - path: type: Exact value: /exact - sessionPersistence: null status: parents: - conditions: 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 351c32f0ecc..f2aab324c92 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 84cbce084ba..f07df0591d4 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 @@ -61,7 +61,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 85a062ff0a4..e2cbea3dd90 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 839914f0efb..2b59d98a5b1 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 8c9b7411ac7..6a2571e0e26 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -65,7 +65,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 1d787ce79c5..79131ac54f1 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 @@ -65,7 +65,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 4d0cb5df2fd..21596a52d42 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e4e55540028..7f25b160719 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 @@ -73,7 +73,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 b33025f3223..6429820c1a3 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 aae559beae4..0cf9358e1ac 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 @@ -68,7 +68,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 0ba3ce0d850..8d3cb231dd9 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 @@ -66,7 +66,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 90e15f6908a..44067c28c56 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 @@ -67,7 +67,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 71b31e58ae0..0353ec71963 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 @@ -59,7 +59,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index f511a7b1bc5..58921ad7474 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -57,7 +57,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -95,7 +94,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -135,7 +133,6 @@ httpRoutes: queryParams: - name: debug value: "yes" - sessionPersistence: null status: parents: - conditions: @@ -172,7 +169,6 @@ httpRoutes: matches: - path: value: /v1/example - sessionPersistence: null status: parents: - conditions: @@ -212,7 +208,6 @@ httpRoutes: value: one path: value: /v1/status - sessionPersistence: null status: parents: - conditions: @@ -249,7 +244,6 @@ httpRoutes: matches: - path: value: /v1/status - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml index 52bc437aadb..e02cf0852f4 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml @@ -128,7 +128,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -167,7 +166,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 e4752f75b46..674289ecd64 100755 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -252,7 +252,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -291,7 +290,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -330,7 +328,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -369,7 +366,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml index cb0560704a6..d2bc2693cbf 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -159,7 +159,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -198,7 +197,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml index 0399092e84f..3683c0fd036 100755 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -99,7 +98,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml index bc83d374079..c92591ff933 100755 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml @@ -150,7 +150,6 @@ grpcRoutes: - name: magic type: Exact value: foo - sessionPersistence: null status: parents: - conditions: @@ -186,7 +185,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml index 18b2e947913..402a4a3e4a2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -60,14 +60,12 @@ httpRoutes: matches: - path: value: /foo1 - sessionPersistence: null - backendRefs: - name: service-2 port: 8080 matches: - path: value: /foo2 - sessionPersistence: null status: parents: - conditions: @@ -106,7 +104,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index 36825939f02..f5dff15241d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -135,7 +135,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -175,7 +174,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -214,7 +212,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 c7b7d346e8c..f13afd5abf3 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: 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 2efca502b49..0d52890c692 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: 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 48790201e4a..bcbc82868f7 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: 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 53c2483939a..9f051341a41 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: 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 bf2f0f9a235..aa7fd5e3738 100755 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -125,7 +125,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -164,7 +163,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml index 20ffe990ca2..89374356f49 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -60,14 +60,12 @@ httpRoutes: matches: - path: value: /foo1 - sessionPersistence: null - backendRefs: - name: service-2 port: 8080 matches: - path: value: /foo2 - sessionPersistence: null status: parents: - conditions: @@ -106,7 +104,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: 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 7d168614492..4cb4593139a 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 @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -99,7 +98,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml index da9dffa3557..f86b30220ca 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml @@ -95,7 +95,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -135,7 +134,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: 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 20b53b56bd7..23183e0da9e 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 @@ -95,7 +95,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -135,7 +134,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml index f9f1fb2c967..0560f023a0a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml @@ -95,7 +95,6 @@ grpcRoutes: - backendRefs: - name: service-1 port: 8080 - sessionPersistence: null status: parents: - conditions: @@ -135,7 +134,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml index 3a317aef686..821dcd7090e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -60,7 +60,6 @@ httpRoutes: matches: - path: value: /foo - sessionPersistence: null status: parents: - conditions: @@ -99,7 +98,6 @@ httpRoutes: matches: - path: value: /bar - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml index 3d44a6ec050..08e2e85c06e 100755 --- a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml @@ -128,7 +128,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -167,7 +166,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: diff --git a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml index b761e77e592..fb5c6f89acc 100755 --- a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml @@ -128,7 +128,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: @@ -167,7 +166,6 @@ httpRoutes: matches: - path: value: / - sessionPersistence: null status: parents: - conditions: From 7c9dfc542b246d83b3d3512c5b8504a5025cdc71 Mon Sep 17 00:00:00 2001 From: zirain Date: Thu, 9 May 2024 11:35:20 +0800 Subject: [PATCH 4/8] api: unhide FilterOrder (#3358) Signed-off-by: zirain --- api/v1alpha1/envoyproxy_types.go | 1 - site/content/en/latest/api/extension_types.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1alpha1/envoyproxy_types.go b/api/v1alpha1/envoyproxy_types.go index efd04149dbe..d8afe76ca78 100644 --- a/api/v1alpha1/envoyproxy_types.go +++ b/api/v1alpha1/envoyproxy_types.go @@ -116,7 +116,6 @@ type EnvoyProxySpec struct { // - envoy.filters.http.router // // +optional - // +notImplementedHide FilterOrder []FilterPosition `json:"filterOrder,omitempty"` // BackendTLS is the TLS configuration for the Envoy proxy to use when connecting to backends. // These settings are applied on backends for which TLS policies are specified. diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index cb74c44f487..f99e636a2d8 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -1162,6 +1162,7 @@ _Appears in:_ | `extraArgs` | _string array_ | false | ExtraArgs defines additional command line options that are provided to Envoy.
More info: https://www.envoyproxy.io/docs/envoy/latest/operations/cli#command-line-options
Note: some command line options are used internally(e.g. --log-level) so they cannot be provided here. | | `mergeGateways` | _boolean_ | false | MergeGateways defines if Gateway resources should be merged onto the same Envoy Proxy Infrastructure.
Setting this field to true would merge all Gateway Listeners under the parent Gateway Class.
This means that the port, protocol and hostname tuple must be unique for every listener.
If a duplicate listener is detected, the newer listener (based on timestamp) will be rejected and its status will be updated with a "Accepted=False" condition. | | `shutdown` | _[ShutdownConfig](#shutdownconfig)_ | false | Shutdown defines configuration for graceful envoy shutdown process. | +| `filterOrder` | _[FilterPosition](#filterposition) array_ | false | FilterOrder defines the order of filters in the Envoy proxy's HTTP filter chain.
The FilterPosition in the list will be applied in the order they are defined.
If unspecified, the default filter order is applied.
Default filter order is:

- envoy.filters.http.fault

- envoy.filters.http.cors

- envoy.filters.http.ext_authz

- envoy.filters.http.basic_authn

- envoy.filters.http.oauth2

- envoy.filters.http.jwt_authn

- envoy.filters.http.ext_proc

- envoy.filters.http.wasm

- envoy.filters.http.local_ratelimit

- envoy.filters.http.ratelimit

- envoy.filters.http.router | | `backendTLS` | _[BackendTLSConfig](#backendtlsconfig)_ | false | BackendTLS is the TLS configuration for the Envoy proxy to use when connecting to backends.
These settings are applied on backends for which TLS policies are specified. | From 7124585c06c94e33e43a51efd64916c77f478ce2 Mon Sep 17 00:00:00 2001 From: shahar-h Date: Thu, 9 May 2024 09:44:07 +0300 Subject: [PATCH 5/8] chore: bump golang to 1.22.3 (#3351) * chore: bump golang to 1.22.3 Signed-off-by: Shahar Harari * fix go version Signed-off-by: Shahar Harari --------- Signed-off-by: Shahar Harari Co-authored-by: zirain --- go.mod | 2 +- site/go.mod | 2 +- test/e2e/base/manifests.yaml | 2 +- test/e2e/testdata/ext-proc-service.yaml | 2 +- tools/src/buf/go.mod | 2 +- tools/src/controller-gen/go.mod | 2 +- tools/src/crd-ref-docs/go.mod | 2 +- tools/src/crd-ref-docs/go.sum | 29 ------------------------- tools/src/golangci-lint/go.mod | 2 +- tools/src/helm-docs/go.mod | 2 +- tools/src/kind/go.mod | 2 +- tools/src/protoc-gen-go-grpc/go.mod | 2 +- tools/src/protoc-gen-go/go.mod | 2 +- tools/src/setup-envtest/go.mod | 2 +- 14 files changed, 13 insertions(+), 42 deletions(-) diff --git a/go.mod b/go.mod index 79d26be8cb7..2161f6966bb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway -go 1.22.2 +go 1.22.3 require ( fortio.org/fortio v1.63.7 diff --git a/site/go.mod b/site/go.mod index e5dbc323868..2e17a4c7ded 100644 --- a/site/go.mod +++ b/site/go.mod @@ -1,6 +1,6 @@ module github.com/google/docsy-example -go 1.22.2 +go 1.22.3 require ( github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2 // indirect diff --git a/test/e2e/base/manifests.yaml b/test/e2e/base/manifests.yaml index 92a1c6e0a9d..395c626b84a 100644 --- a/test/e2e/base/manifests.yaml +++ b/test/e2e/base/manifests.yaml @@ -624,7 +624,7 @@ spec: - sh - "-c" - "cp -a /app /app-live && cd /app-live && go run . " - image: golang:1.22.1-alpine + image: golang:1.22.3-alpine ports: - containerPort: 8000 volumeMounts: diff --git a/test/e2e/testdata/ext-proc-service.yaml b/test/e2e/testdata/ext-proc-service.yaml index 665779e96e4..91b698ed674 100644 --- a/test/e2e/testdata/ext-proc-service.yaml +++ b/test/e2e/testdata/ext-proc-service.yaml @@ -377,7 +377,7 @@ spec: - sh - "-c" - "cp -a /app /app-live && cd /app-live && go run . --certPath=/app-live/certs/ " - image: golang:1.22.1-alpine + image: golang:1.22.3-alpine ports: - containerPort: 8000 volumeMounts: diff --git a/tools/src/buf/go.mod b/tools/src/buf/go.mod index ce8418a052e..1bfa5bf4d37 100644 --- a/tools/src/buf/go.mod +++ b/tools/src/buf/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.2 +go 1.22.3 require github.com/bufbuild/buf v1.31.0 diff --git a/tools/src/controller-gen/go.mod b/tools/src/controller-gen/go.mod index 912f4804b90..28478b149c6 100644 --- a/tools/src/controller-gen/go.mod +++ b/tools/src/controller-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.2 +go 1.22.3 require sigs.k8s.io/controller-tools v0.15.0 diff --git a/tools/src/crd-ref-docs/go.mod b/tools/src/crd-ref-docs/go.mod index 764ff255a6f..6106a07e202 100644 --- a/tools/src/crd-ref-docs/go.mod +++ b/tools/src/crd-ref-docs/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.2 +go 1.22.3 require github.com/elastic/crd-ref-docs v0.0.13-0.20240413123740-ea9fcaa0230f diff --git a/tools/src/crd-ref-docs/go.sum b/tools/src/crd-ref-docs/go.sum index af2c38bb430..7dc3f5d0bbe 100644 --- a/tools/src/crd-ref-docs/go.sum +++ b/tools/src/crd-ref-docs/go.sum @@ -8,16 +8,12 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/elastic/crd-ref-docs v0.0.12 h1:F3seyncbzUz3rT3d+caeYWhumb5ojYQ6Bl0Z+zOp16M= -github.com/elastic/crd-ref-docs v0.0.12/go.mod h1:X83mMBdJt05heJUYiS3T0yJ/JkCuliuhSUNav5Gjo/U= github.com/elastic/crd-ref-docs v0.0.13-0.20240413123740-ea9fcaa0230f h1:cE1CF4Bfi+9gvaNz35jOsp3tFJVm/mFr88szZ41FG8Q= github.com/elastic/crd-ref-docs v0.0.13-0.20240413123740-ea9fcaa0230f/go.mod h1:X83mMBdJt05heJUYiS3T0yJ/JkCuliuhSUNav5Gjo/U= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -38,14 +34,10 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -94,8 +86,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/zirain/crd-ref-docs v0.0.0-20240330085406-9336d26578da h1:hWtaeh12ZlN8dCexpNFhzK68LayDbql4nNgfe+cYUPc= -github.com/zirain/crd-ref-docs v0.0.0-20240330085406-9336d26578da/go.mod h1:X83mMBdJt05heJUYiS3T0yJ/JkCuliuhSUNav5Gjo/U= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -105,29 +95,21 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -135,8 +117,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -147,8 +127,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -167,21 +145,14 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= -k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI= k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc= k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A= diff --git a/tools/src/golangci-lint/go.mod b/tools/src/golangci-lint/go.mod index 2d4b295bedf..c4185482bf1 100644 --- a/tools/src/golangci-lint/go.mod +++ b/tools/src/golangci-lint/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.2 +go 1.22.3 require github.com/golangci/golangci-lint v1.58.0 diff --git a/tools/src/helm-docs/go.mod b/tools/src/helm-docs/go.mod index b965c0bb36c..fde387c3cd5 100644 --- a/tools/src/helm-docs/go.mod +++ b/tools/src/helm-docs/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/helm-docs -go 1.22.2 +go 1.22.3 require github.com/norwoodj/helm-docs v1.13.0 diff --git a/tools/src/kind/go.mod b/tools/src/kind/go.mod index 4489b3fa0b1..8d0a79d0adf 100644 --- a/tools/src/kind/go.mod +++ b/tools/src/kind/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/kind -go 1.22.2 +go 1.22.3 require sigs.k8s.io/kind v0.22.0 diff --git a/tools/src/protoc-gen-go-grpc/go.mod b/tools/src/protoc-gen-go-grpc/go.mod index df13e99fa8f..1529cee129b 100644 --- a/tools/src/protoc-gen-go-grpc/go.mod +++ b/tools/src/protoc-gen-go-grpc/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/protoc-gen-go-grpc -go 1.22.2 +go 1.22.3 require google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 diff --git a/tools/src/protoc-gen-go/go.mod b/tools/src/protoc-gen-go/go.mod index fac0556186e..21244e77351 100644 --- a/tools/src/protoc-gen-go/go.mod +++ b/tools/src/protoc-gen-go/go.mod @@ -1,5 +1,5 @@ module github.com/envoyproxy/gateway/tools/src/protoc-gen-go -go 1.22.2 +go 1.22.3 require google.golang.org/protobuf v1.33.0 diff --git a/tools/src/setup-envtest/go.mod b/tools/src/setup-envtest/go.mod index 02a0ec3ef80..2d1c09adcda 100644 --- a/tools/src/setup-envtest/go.mod +++ b/tools/src/setup-envtest/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.2 +go 1.22.3 require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240423173400-ed81fa696dea From bb348dc2effd9b0207980abfe103fa238ed0a566 Mon Sep 17 00:00:00 2001 From: shahar-h Date: Thu, 9 May 2024 19:41:10 +0300 Subject: [PATCH 6/8] docs: fix broken BackendTLSPolicy samples (#3362) Signed-off-by: Shahar Harari --- .../en/latest/tasks/security/backend-tls.md | 20 +++++++++---------- .../en/latest/tasks/security/ext-auth.md | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/site/content/en/latest/tasks/security/backend-tls.md b/site/content/en/latest/tasks/security/backend-tls.md index aeedcd503d4..93d155eb30e 100644 --- a/site/content/en/latest/tasks/security/backend-tls.md +++ b/site/content/en/latest/tasks/security/backend-tls.md @@ -139,19 +139,19 @@ Create a [BackendTLSPolicy][] instructing Envoy Gateway to establish a TLS conne ```shell cat < Date: Fri, 10 May 2024 04:53:18 +1000 Subject: [PATCH 7/8] feat(translator): Implement header hash policy for consistent hash load balancers (#3357) * Map consistent hash configuration Signed-off-by: Harry Turton * Implement mapping and add tests Signed-off-by: Harry Turton * Small refactors, add yaml keys Signed-off-by: Harry Turton * Add documentation and lints Signed-off-by: Harry Turton * Add additional tests Signed-off-by: Harry Turton --------- Signed-off-by: Harry Turton --- api/v1alpha1/loadbalancer_types.go | 3 +- ....envoyproxy.io_backendtrafficpolicies.yaml | 3 +- internal/gatewayapi/backendtrafficpolicy.go | 23 +++-- internal/ir/xds.go | 8 +- internal/ir/xds_test.go | 14 +++- internal/ir/zz_generated.deepcopy.go | 5 ++ internal/xds/translator/listener_test.go | 2 +- internal/xds/translator/route.go | 19 ++++- internal/xds/translator/route_test.go | 84 +++++++++++++++++++ .../testdata/in/xds-ir/load-balancer.yaml | 12 +++ .../out/xds-ir/load-balancer.clusters.yaml | 17 ++++ .../out/xds-ir/load-balancer.endpoints.yaml | 12 +++ .../out/xds-ir/load-balancer.routes.yaml | 10 +++ site/content/en/latest/api/extension_types.md | 3 +- 14 files changed, 199 insertions(+), 16 deletions(-) create mode 100644 internal/xds/translator/route_test.go diff --git a/api/v1alpha1/loadbalancer_types.go b/api/v1alpha1/loadbalancer_types.go index 2a0fb21e515..795390bb525 100644 --- a/api/v1alpha1/loadbalancer_types.go +++ b/api/v1alpha1/loadbalancer_types.go @@ -57,7 +57,7 @@ const ( // // +kubebuilder:validation:XValidation:rule="self.type == 'Header' ? has(self.header) : !has(self.header)",message="If consistent hash type is header, the header field must be set." type ConsistentHash struct { - // Valid Type values are "SourceIP". + // ConsistentHashType defines the type of input to hash on. Valid Type values are "SourceIP" or "Header". // // +unionDiscriminator Type ConsistentHashType `json:"type"` @@ -65,7 +65,6 @@ type ConsistentHash struct { // Header configures the header hash policy when the consistent hash type is set to Header. // // +optional - // +notImplementedHide Header *Header `json:"header,omitempty"` } diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml index ba195c65408..6f5b369ce73 100644 --- a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml +++ b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml @@ -423,7 +423,8 @@ spec: - name type: object type: - description: Valid Type values are "SourceIP". + description: ConsistentHashType defines the type of input + to hash on. Valid Type values are "SourceIP" or "Header". enum: - SourceIP - Header diff --git a/internal/gatewayapi/backendtrafficpolicy.go b/internal/gatewayapi/backendtrafficpolicy.go index 37d61a2a41d..852cc201d28 100644 --- a/internal/gatewayapi/backendtrafficpolicy.go +++ b/internal/gatewayapi/backendtrafficpolicy.go @@ -764,11 +764,7 @@ func (t *Translator) buildLoadBalancer(policy *egv1a1.BackendTrafficPolicy) *ir. switch policy.Spec.LoadBalancer.Type { case egv1a1.ConsistentHashLoadBalancerType: lb = &ir.LoadBalancer{ - ConsistentHash: &ir.ConsistentHash{}, - } - if policy.Spec.LoadBalancer.ConsistentHash != nil && - policy.Spec.LoadBalancer.ConsistentHash.Type == egv1a1.SourceIPConsistentHashType { - lb.ConsistentHash.SourceIP = ptr.To(true) + ConsistentHash: t.buildConsistentHashLoadBalancer(policy), } case egv1a1.LeastRequestLoadBalancerType: lb = &ir.LoadBalancer{} @@ -805,6 +801,23 @@ func (t *Translator) buildLoadBalancer(policy *egv1a1.BackendTrafficPolicy) *ir. return lb } +func (t *Translator) buildConsistentHashLoadBalancer(policy *egv1a1.BackendTrafficPolicy) *ir.ConsistentHash { + switch policy.Spec.LoadBalancer.ConsistentHash.Type { + case egv1a1.SourceIPConsistentHashType: + return &ir.ConsistentHash{ + SourceIP: ptr.To(true), + } + case egv1a1.HeaderConsistentHashType: + return &ir.ConsistentHash{ + Header: &ir.Header{ + Name: policy.Spec.LoadBalancer.ConsistentHash.Header.Name, + }, + } + default: + return &ir.ConsistentHash{} + } +} + func (t *Translator) buildProxyProtocol(policy *egv1a1.BackendTrafficPolicy) *ir.ProxyProtocol { var pp *ir.ProxyProtocol switch policy.Spec.ProxyProtocol.Version { diff --git a/internal/ir/xds.go b/internal/ir/xds.go index 02f3f448aee..cc6adecbebb 100644 --- a/internal/ir/xds.go +++ b/internal/ir/xds.go @@ -1575,7 +1575,13 @@ type Random struct{} // +k8s:deepcopy-gen=true type ConsistentHash struct { // Hash based on the Source IP Address - SourceIP *bool `json:"sourceIP,omitempty" yaml:"sourceIP,omitempty"` + SourceIP *bool `json:"sourceIP,omitempty" yaml:"sourceIP,omitempty"` + Header *Header `json:"header,omitempty" yaml:"header,omitempty"` +} + +// Header consistent hash type settings +type Header struct { + Name string `json:"name" yaml:"name"` } type ProxyProtocolVersion string diff --git a/internal/ir/xds_test.go b/internal/ir/xds_test.go index ab42d763711..7251c7cb0f1 100644 --- a/internal/ir/xds_test.go +++ b/internal/ir/xds_test.go @@ -1243,7 +1243,7 @@ func TestValidateLoadBalancer(t *testing.T) { want: nil, }, { - name: "consistent hash", + name: "consistent hash with source IP hash policy", input: LoadBalancer{ ConsistentHash: &ConsistentHash{ SourceIP: ptr.To(true), @@ -1251,7 +1251,17 @@ func TestValidateLoadBalancer(t *testing.T) { }, want: nil, }, - + { + name: "consistent hash with header hash policy", + input: LoadBalancer{ + ConsistentHash: &ConsistentHash{ + Header: &Header{ + Name: "name", + }, + }, + }, + want: nil, + }, { name: "least request and random set", input: LoadBalancer{ diff --git a/internal/ir/zz_generated.deepcopy.go b/internal/ir/zz_generated.deepcopy.go index f400de7019c..584a4a588b1 100644 --- a/internal/ir/zz_generated.deepcopy.go +++ b/internal/ir/zz_generated.deepcopy.go @@ -358,6 +358,11 @@ func (in *ConsistentHash) DeepCopyInto(out *ConsistentHash) { *out = new(bool) **out = **in } + if in.Header != nil { + in, out := &in.Header, &out.Header + *out = new(Header) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsistentHash. diff --git a/internal/xds/translator/listener_test.go b/internal/xds/translator/listener_test.go index 97512fae5ae..28572bb06be 100644 --- a/internal/xds/translator/listener_test.go +++ b/internal/xds/translator/listener_test.go @@ -64,7 +64,7 @@ func Test_buildTCPProxyHashPolicy(t *testing.T) { want: nil, }, { - name: "ConsistentHash without SourceIP", + name: "ConsistentHash without hash policy", lb: &ir.LoadBalancer{ConsistentHash: &ir.ConsistentHash{}}, want: nil, }, diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go index fb894d66105..a52371103f0 100644 --- a/internal/xds/translator/route.go +++ b/internal/xds/translator/route.go @@ -440,7 +440,20 @@ func buildHashPolicy(httpRoute *ir.HTTPRoute) []*routev3.RouteAction_HashPolicy return nil } - if httpRoute.LoadBalancer.ConsistentHash.SourceIP != nil && *httpRoute.LoadBalancer.ConsistentHash.SourceIP { + switch { + case httpRoute.LoadBalancer.ConsistentHash.Header != nil: + hashPolicy := &routev3.RouteAction_HashPolicy{ + PolicySpecifier: &routev3.RouteAction_HashPolicy_Header_{ + Header: &routev3.RouteAction_HashPolicy_Header{ + HeaderName: httpRoute.LoadBalancer.ConsistentHash.Header.Name, + }, + }, + } + return []*routev3.RouteAction_HashPolicy{hashPolicy} + case httpRoute.LoadBalancer.ConsistentHash.SourceIP != nil: + if !*httpRoute.LoadBalancer.ConsistentHash.SourceIP { + return nil + } hashPolicy := &routev3.RouteAction_HashPolicy{ PolicySpecifier: &routev3.RouteAction_HashPolicy_ConnectionProperties_{ ConnectionProperties: &routev3.RouteAction_HashPolicy_ConnectionProperties{ @@ -449,9 +462,9 @@ func buildHashPolicy(httpRoute *ir.HTTPRoute) []*routev3.RouteAction_HashPolicy }, } return []*routev3.RouteAction_HashPolicy{hashPolicy} + default: + return nil } - - return nil } func buildRetryPolicy(route *ir.HTTPRoute) (*routev3.RetryPolicy, error) { diff --git a/internal/xds/translator/route_test.go b/internal/xds/translator/route_test.go new file mode 100644 index 00000000000..ed9198b6c01 --- /dev/null +++ b/internal/xds/translator/route_test.go @@ -0,0 +1,84 @@ +// Copyright Envoy Gateway Authors +// SPDX-License-Identifier: Apache-2.0 +// The full text of the Apache license is available in the LICENSE file at +// the root of the repo. + +package translator + +import ( + "reflect" + "testing" + + routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" + "k8s.io/utils/ptr" + + "github.com/envoyproxy/gateway/internal/ir" +) + +func Test_buildHashPolicy(t *testing.T) { + tests := []struct { + name string + httpRoute *ir.HTTPRoute + want []*routev3.RouteAction_HashPolicy + }{ + { + name: "Nil HttpRoute", + httpRoute: nil, + want: nil, + }, + { + name: "Nil LoadBalancer in HttpRoute", + httpRoute: &ir.HTTPRoute{}, + want: nil, + }, + { + name: "Nil ConsistentHash in LoadBalancer", + httpRoute: &ir.HTTPRoute{LoadBalancer: &ir.LoadBalancer{}}, + want: nil, + }, + { + name: "ConsistentHash with nil SourceIP and Header", + httpRoute: &ir.HTTPRoute{LoadBalancer: &ir.LoadBalancer{ConsistentHash: &ir.ConsistentHash{}}}, + want: nil, + }, + { + name: "ConsistentHash with SourceIP set to false", + httpRoute: &ir.HTTPRoute{LoadBalancer: &ir.LoadBalancer{ConsistentHash: &ir.ConsistentHash{SourceIP: ptr.To(false)}}}, + want: nil, + }, + { + name: "ConsistentHash with SourceIP set to true", + httpRoute: &ir.HTTPRoute{LoadBalancer: &ir.LoadBalancer{ConsistentHash: &ir.ConsistentHash{SourceIP: ptr.To(true)}}}, + want: []*routev3.RouteAction_HashPolicy{ + { + PolicySpecifier: &routev3.RouteAction_HashPolicy_ConnectionProperties_{ + ConnectionProperties: &routev3.RouteAction_HashPolicy_ConnectionProperties{ + SourceIp: true, + }, + }, + }, + }, + }, + { + name: "ConsistentHash with Header", + httpRoute: &ir.HTTPRoute{LoadBalancer: &ir.LoadBalancer{ConsistentHash: &ir.ConsistentHash{Header: &ir.Header{Name: "name"}}}}, + want: []*routev3.RouteAction_HashPolicy{ + { + PolicySpecifier: &routev3.RouteAction_HashPolicy_Header_{ + Header: &routev3.RouteAction_HashPolicy_Header{ + HeaderName: "name", + }, + }, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := buildHashPolicy(tt.httpRoute) + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("buildHashPolicy() got = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index fbf13ae8865..9c76ca46bff 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -73,3 +73,15 @@ http: - endpoints: - host: "1.2.3.4" port: 50000 + - name: "seventh-route" + hostname: "*" + loadBalancer: + consistentHash: + header: + name: name + destination: + name: "seventh-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml index fc755fed368..d9fedf2c8d3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml @@ -104,3 +104,20 @@ slowStartConfig: slowStartWindow: 300s type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_ONLY + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: seventh-route-dest + lbPolicy: MAGLEV + name: seventh-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml index ee22b49d2b2..0860c1852a5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml @@ -70,3 +70,15 @@ loadBalancingWeight: 1 locality: region: sixth-route-dest/backend/0 +- clusterName: seventh-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: seventh-route-dest/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml index 49db596538b..080b9aaff0a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml @@ -50,3 +50,13 @@ cluster: sixth-route-dest upgradeConfigs: - upgradeType: websocket + - match: + prefix: / + name: seventh-route + route: + cluster: seventh-route-dest + hashPolicy: + - header: + headerName: name + upgradeConfigs: + - upgradeType: websocket diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index f99e636a2d8..bc85633137c 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -562,7 +562,8 @@ _Appears in:_ | Field | Type | Required | Description | | --- | --- | --- | --- | -| `type` | _[ConsistentHashType](#consistenthashtype)_ | true | Valid Type values are "SourceIP". | +| `type` | _[ConsistentHashType](#consistenthashtype)_ | true | ConsistentHashType defines the type of input to hash on. Valid Type values are "SourceIP" or "Header". | +| `header` | _[Header](#header)_ | false | Header configures the header hash policy when the consistent hash type is set to Header. | #### ConsistentHashType From 33443f8846f105adaa57699fdd90202b5670c3ce Mon Sep 17 00:00:00 2001 From: sh2 Date: Fri, 10 May 2024 04:25:55 +0800 Subject: [PATCH 8/8] feat: add envoy extension policy support for egctl x status (#3363) add envoy extension policy support for egctl x status Signed-off-by: shawnh2 --- internal/cmd/egctl/status.go | 10 +++++++++- internal/gatewayapi/translator.go | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/cmd/egctl/status.go b/internal/cmd/egctl/status.go index 80df4237207..ac7886e3f5d 100644 --- a/internal/cmd/egctl/status.go +++ b/internal/cmd/egctl/status.go @@ -34,7 +34,7 @@ var ( supportedXPolicyTypes = []string{ gatewayapi.KindBackendTLSPolicy, gatewayapi.KindBackendTrafficPolicy, gatewayapi.KindClientTrafficPolicy, - gatewayapi.KindSecurityPolicy, gatewayapi.KindEnvoyPatchPolicy, + gatewayapi.KindSecurityPolicy, gatewayapi.KindEnvoyPatchPolicy, gatewayapi.KindEnvoyExtensionPolicy, } supportedAllTypes = []string{ @@ -238,6 +238,14 @@ func runStatus(ctx context.Context, cli client.Client, inputResourceType, namesp resourcesList = &epp resourceKind = gatewayapi.KindEnvoyPatchPolicy + case "eep", "envoyextensionpolicy": + eep := egv1a1.EnvoyExtensionPolicyList{} + if err := cli.List(ctx, &eep, client.InNamespace(namespace)); err != nil { + return err + } + resourcesList = &eep + resourceKind = gatewayapi.KindEnvoyExtensionPolicy + case "sp", "securitypolicy": sp := egv1a1.SecurityPolicyList{} if err := cli.List(ctx, &sp, client.InNamespace(namespace)); err != nil { diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go index d6c5283930f..7b70748e953 100644 --- a/internal/gatewayapi/translator.go +++ b/internal/gatewayapi/translator.go @@ -23,6 +23,7 @@ const ( KindBackendTrafficPolicy = "BackendTrafficPolicy" KindBackendTLSPolicy = "BackendTLSPolicy" KindEnvoyPatchPolicy = "EnvoyPatchPolicy" + KindEnvoyExtensionPolicy = "EnvoyExtensionPolicy" KindSecurityPolicy = "SecurityPolicy" KindEnvoyProxy = "EnvoyProxy" KindGateway = "Gateway"