diff --git a/apis/v1/grpcroute_types.go b/apis/v1/grpcroute_types.go index cd74dd8cc0..79e4d5faf9 100644 --- a/apis/v1/grpcroute_types.go +++ b/apis/v1/grpcroute_types.go @@ -302,13 +302,14 @@ type GRPCRouteRule struct { // is `foo` AND it contains the `version: v1` header: // // ``` -// matches: -// - method: -// type: Exact -// service: "foo" -// - headers: -// name: "version" -// value "v1" +// +// matches: +// - method: +// type: Exact +// service: "foo" +// headers: +// - name: "version" +// value: "v1" // // ``` type GRPCRouteMatch struct { diff --git a/apis/v1/httproute_types.go b/apis/v1/httproute_types.go index b821cf7e19..0e1b7ce0b8 100644 --- a/apis/v1/httproute_types.go +++ b/apis/v1/httproute_types.go @@ -754,7 +754,7 @@ const ( // value: "/foo" // headers: // - name: "version" -// value "v1" +// value: "v1" // // ``` type HTTPRouteMatch struct { diff --git a/applyconfiguration/apis/v1/grpcroutematch.go b/applyconfiguration/apis/v1/grpcroutematch.go index 1bb84a6db9..91ed737bcc 100644 --- a/applyconfiguration/apis/v1/grpcroutematch.go +++ b/applyconfiguration/apis/v1/grpcroutematch.go @@ -29,13 +29,14 @@ package v1 // is `foo` AND it contains the `version: v1` header: // // ``` +// // matches: // - method: // type: Exact // service: "foo" -// - headers: -// name: "version" -// value "v1" +// headers: +// - name: "version" +// value: "v1" // // ``` type GRPCRouteMatchApplyConfiguration struct { diff --git a/applyconfiguration/apis/v1/httproutematch.go b/applyconfiguration/apis/v1/httproutematch.go index 21c511d93d..262423bf82 100644 --- a/applyconfiguration/apis/v1/httproutematch.go +++ b/applyconfiguration/apis/v1/httproutematch.go @@ -39,7 +39,7 @@ import ( // value: "/foo" // headers: // - name: "version" -// value "v1" +// value: "v1" // // ``` type HTTPRouteMatchApplyConfiguration struct { diff --git a/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml index 3386eff429..33013ec3b7 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml @@ -1733,24 +1733,14 @@ spec: matching precedence MUST be granted to the first matching rule meeting the above criteria. items: - description: |- - GRPCRouteMatch defines the predicate used to match requests to a given - action. Multiple match types are ANDed together, i.e. the match will - evaluate to true only if all conditions are satisfied. - - For example, the match below will match a gRPC request only if its service - is `foo` AND it contains the `version: v1` header: - - ``` - matches: - - method: - type: Exact - service: "foo" - - headers: - name: "version" - value "v1" - - ``` + description: "GRPCRouteMatch defines the predicate used to + match requests to a given\naction. Multiple match types + are ANDed together, i.e. the match will\nevaluate to true + only if all conditions are satisfied.\n\nFor example, the + match below will match a gRPC request only if its service\nis + `foo` AND it contains the `version: v1` header:\n\n```\n\n\tmatches:\n\t- + method:\n\t type: Exact\n\t service: \"foo\"\n\t headers:\n\t + \ - name: \"version\"\n\t value: \"v1\"\n\n```" properties: headers: description: |- diff --git a/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml index 5612342160..3aed193663 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml @@ -3438,7 +3438,7 @@ spec: match below will match a HTTP request only if its path\nstarts with `/foo` AND it contains the `version: v1` header:\n\n```\nmatch:\n\n\tpath:\n\t \ value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t - \ value \"v1\"\n\n```" + \ value: \"v1\"\n\n```" properties: headers: description: |- @@ -7701,7 +7701,7 @@ spec: match below will match a HTTP request only if its path\nstarts with `/foo` AND it contains the `version: v1` header:\n\n```\nmatch:\n\n\tpath:\n\t \ value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t - \ value \"v1\"\n\n```" + \ value: \"v1\"\n\n```" properties: headers: description: |- diff --git a/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml b/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml index 249a59f010..247a1bfa77 100644 --- a/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml @@ -1654,24 +1654,14 @@ spec: matching precedence MUST be granted to the first matching rule meeting the above criteria. items: - description: |- - GRPCRouteMatch defines the predicate used to match requests to a given - action. Multiple match types are ANDed together, i.e. the match will - evaluate to true only if all conditions are satisfied. - - For example, the match below will match a gRPC request only if its service - is `foo` AND it contains the `version: v1` header: - - ``` - matches: - - method: - type: Exact - service: "foo" - - headers: - name: "version" - value "v1" - - ``` + description: "GRPCRouteMatch defines the predicate used to + match requests to a given\naction. Multiple match types + are ANDed together, i.e. the match will\nevaluate to true + only if all conditions are satisfied.\n\nFor example, the + match below will match a gRPC request only if its service\nis + `foo` AND it contains the `version: v1` header:\n\n```\n\n\tmatches:\n\t- + method:\n\t type: Exact\n\t service: \"foo\"\n\t headers:\n\t + \ - name: \"version\"\n\t value: \"v1\"\n\n```" properties: headers: description: |- diff --git a/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml b/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml index 7b87e6cdc5..b76e9ef836 100644 --- a/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml @@ -2847,7 +2847,7 @@ spec: match below will match a HTTP request only if its path\nstarts with `/foo` AND it contains the `version: v1` header:\n\n```\nmatch:\n\n\tpath:\n\t \ value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t - \ value \"v1\"\n\n```" + \ value: \"v1\"\n\n```" properties: headers: description: |- @@ -6297,7 +6297,7 @@ spec: match below will match a HTTP request only if its path\nstarts with `/foo` AND it contains the `version: v1` header:\n\n```\nmatch:\n\n\tpath:\n\t \ value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t - \ value \"v1\"\n\n```" + \ value: \"v1\"\n\n```" properties: headers: description: |- diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 4b8c41bb57..6e88376ec7 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -3774,7 +3774,7 @@ func schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteMatch(ref common.ReferenceCal return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "GRPCRouteMatch defines the predicate used to match requests to a given action. Multiple match types are ANDed together, i.e. the match will evaluate to true only if all conditions are satisfied.\n\nFor example, the match below will match a gRPC request only if its service is `foo` AND it contains the `version: v1` header:\n\n``` matches:\n - method:\n type: Exact\n service: \"foo\"\n - headers:\n name: \"version\"\n value \"v1\"\n\n```", + Description: "GRPCRouteMatch defines the predicate used to match requests to a given action. Multiple match types are ANDed together, i.e. the match will evaluate to true only if all conditions are satisfied.\n\nFor example, the match below will match a gRPC request only if its service is `foo` AND it contains the `version: v1` header:\n\n```\n\n\tmatches:\n\t- method:\n\t type: Exact\n\t service: \"foo\"\n\t headers:\n\t - name: \"version\"\n\t value: \"v1\"\n\n```", Type: []string{"object"}, Properties: map[string]spec.Schema{ "method": { @@ -5437,7 +5437,7 @@ func schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteMatch(ref common.ReferenceCal return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "HTTPRouteMatch defines the predicate used to match requests to a given action. Multiple match types are ANDed together, i.e. the match will evaluate to true only if all conditions are satisfied.\n\nFor example, the match below will match a HTTP request only if its path starts with `/foo` AND it contains the `version: v1` header:\n\n``` match:\n\n\tpath:\n\t value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t value \"v1\"\n\n```", + Description: "HTTPRouteMatch defines the predicate used to match requests to a given action. Multiple match types are ANDed together, i.e. the match will evaluate to true only if all conditions are satisfied.\n\nFor example, the match below will match a HTTP request only if its path starts with `/foo` AND it contains the `version: v1` header:\n\n``` match:\n\n\tpath:\n\t value: \"/foo\"\n\theaders:\n\t- name: \"version\"\n\t value: \"v1\"\n\n```", Type: []string{"object"}, Properties: map[string]spec.Schema{ "path": {