Skip to content

Commit

Permalink
Merge branch 'main' into fix-route-status
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhaohuabing
zhaohuabing authored Oct 31, 2024
2 parents 1b2470e + bb3bbdb commit 0454d0d
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 275 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/build_and_test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,19 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ v1.28.13, v1.29.8, v1.30.4, v1.31.0 ]
target:
- version: v1.28.13
ipFamily: ipv4
- version: v1.29.8
ipFamily: ipv4
- version: v1.30.4
ipFamily: ipv4
# Enable these after https://github.com/envoyproxy/gateway/issues/4572 fixed
# - version: v1.31.0
# ipFamily: ipv6 # only run ipv6 test on latest version to save time
# TODO: this's IPv4 first, need a way to test IPv6 first.
- version: v1.31.0
ipFamily: dual # only run dual test on latest version to save time
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./tools/github-actions/setup-deps
Expand All @@ -133,8 +145,9 @@ jobs:
# E2E
- name: Run E2E Tests
env:
KIND_NODE_TAG: ${{ matrix.version }}
KIND_NODE_TAG: ${{ matrix.target.version }}
IMAGE_PULL_POLICY: IfNotPresent
IP_FAMILY: ${{ matrix.target.ipFamily }}
run: make e2e

benchmark-test:
Expand Down
8 changes: 2 additions & 6 deletions internal/gatewayapi/runner/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,7 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {
// Publish the IRs.
// Also validate the ir before sending it.
for key, val := range result.InfraIR {
if vlog := r.Logger.V(4); vlog.Enabled() {
vlog.WithValues("infra-ir", key).Info(val.JSONString())
}
r.Logger.V(1).WithValues("infra-ir", key).Info(val.JSONString())
if err := val.Validate(); err != nil {
r.Logger.Error(err, "unable to validate infra ir, skipped sending it")
errChan <- err
Expand All @@ -186,9 +184,7 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {
}

for key, val := range result.XdsIR {
if vlog := r.Logger.V(4); vlog.Enabled() {
vlog.WithValues("xds-ir", key).Info(val.JSONString())
}
r.Logger.V(1).WithValues("xds-ir", key).Info(val.JSONString())
if err := val.Validate(); err != nil {
r.Logger.Error(err, "unable to validate xds ir, skipped sending it")
errChan <- err
Expand Down
140 changes: 7 additions & 133 deletions site/content/en/latest/api/extension_types.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,14 @@ API group.

### Resource Types
- [Backend](#backend)
- [BackendList](#backendlist)
- [BackendTrafficPolicy](#backendtrafficpolicy)
- [BackendTrafficPolicyList](#backendtrafficpolicylist)
- [ClientTrafficPolicy](#clienttrafficpolicy)
- [ClientTrafficPolicyList](#clienttrafficpolicylist)
- [EnvoyExtensionPolicy](#envoyextensionpolicy)
- [EnvoyExtensionPolicyList](#envoyextensionpolicylist)
- [EnvoyGateway](#envoygateway)
- [EnvoyPatchPolicy](#envoypatchpolicy)
- [EnvoyPatchPolicyList](#envoypatchpolicylist)
- [EnvoyProxy](#envoyproxy)
- [HTTPRouteFilter](#httproutefilter)
- [HTTPRouteFilterList](#httproutefilterlist)
- [SecurityPolicy](#securitypolicy)
- [SecurityPolicyList](#securitypolicylist)



Expand Down Expand Up @@ -267,8 +260,7 @@ _Appears in:_
Backend allows the user to configure the endpoints of a backend and
the behavior of the connection from Envoy Proxy to the backend.

_Appears in:_
- [BackendList](#backendlist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand Down Expand Up @@ -328,22 +320,6 @@ _Appears in:_
| `unix` | _[UnixSocket](#unixsocket)_ | false | Unix defines the unix domain socket endpoint |


#### BackendList



BackendList contains a list of Backend resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`BackendList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[Backend](#backend) array_ | true | |


#### BackendRef


Expand Down Expand Up @@ -428,8 +404,7 @@ _Appears in:_
BackendTrafficPolicy allows the user to configure the behavior of the connection
between the Envoy Proxy listener and the backend service.

_Appears in:_
- [BackendTrafficPolicyList](#backendtrafficpolicylist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -440,22 +415,6 @@ _Appears in:_
| `status` | _[PolicyStatus](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1alpha2.PolicyStatus)_ | true | status defines the current status of BackendTrafficPolicy. |


#### BackendTrafficPolicyList



BackendTrafficPolicyList contains a list of BackendTrafficPolicy resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`BackendTrafficPolicyList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[BackendTrafficPolicy](#backendtrafficpolicy) array_ | true | |


#### BackendTrafficPolicySpec


Expand Down Expand Up @@ -637,8 +596,7 @@ _Appears in:_
ClientTrafficPolicy allows the user to configure the behavior of the connection
between the downstream client and Envoy Proxy listener.

_Appears in:_
- [ClientTrafficPolicyList](#clienttrafficpolicylist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -649,22 +607,6 @@ _Appears in:_
| `status` | _[PolicyStatus](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1alpha2.PolicyStatus)_ | true | Status defines the current status of ClientTrafficPolicy. |


#### ClientTrafficPolicyList



ClientTrafficPolicyList contains a list of ClientTrafficPolicy resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`ClientTrafficPolicyList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[ClientTrafficPolicy](#clienttrafficpolicy) array_ | true | |


#### ClientTrafficPolicySpec


Expand Down Expand Up @@ -957,8 +899,7 @@ _Appears in:_

EnvoyExtensionPolicy allows the user to configure various envoy extensibility options for the Gateway.

_Appears in:_
- [EnvoyExtensionPolicyList](#envoyextensionpolicylist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -969,22 +910,6 @@ _Appears in:_
| `status` | _[PolicyStatus](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1alpha2.PolicyStatus)_ | true | Status defines the current status of EnvoyExtensionPolicy. |


#### EnvoyExtensionPolicyList



EnvoyExtensionPolicyList contains a list of EnvoyExtensionPolicy resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`EnvoyExtensionPolicyList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[EnvoyExtensionPolicy](#envoyextensionpolicy) array_ | true | |


#### EnvoyExtensionPolicySpec


Expand Down Expand Up @@ -1350,8 +1275,7 @@ _Appears in:_
EnvoyPatchPolicy allows the user to modify the generated Envoy xDS
resources by Envoy Gateway using this patch API

_Appears in:_
- [EnvoyPatchPolicyList](#envoypatchpolicylist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -1362,22 +1286,6 @@ _Appears in:_
| `status` | _[PolicyStatus](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1alpha2.PolicyStatus)_ | true | Status defines the current status of EnvoyPatchPolicy. |


#### EnvoyPatchPolicyList



EnvoyPatchPolicyList contains a list of EnvoyPatchPolicy resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`EnvoyPatchPolicyList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[EnvoyPatchPolicy](#envoypatchpolicy) array_ | true | |


#### EnvoyPatchPolicySpec


Expand Down Expand Up @@ -2026,8 +1934,7 @@ _Appears in:_
HTTPRouteFilter is a custom Envoy Gateway HTTPRouteFilter which provides extended
traffic processing options such as path regex rewrite, direct response and more.

_Appears in:_
- [HTTPRouteFilterList](#httproutefilterlist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -2037,22 +1944,6 @@ _Appears in:_
| `spec` | _[HTTPRouteFilterSpec](#httproutefilterspec)_ | true | Spec defines the desired state of HTTPRouteFilter. |


#### HTTPRouteFilterList



HTTPRouteFilterList contains a list of HTTPRouteFilter resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`HTTPRouteFilterList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[HTTPRouteFilter](#httproutefilter) array_ | true | |


#### HTTPRouteFilterSpec


Expand Down Expand Up @@ -3638,8 +3529,7 @@ _Appears in:_
SecurityPolicy allows the user to configure various security settings for a
Gateway.

_Appears in:_
- [SecurityPolicyList](#securitypolicylist)


| Field | Type | Required | Description |
| --- | --- | --- | --- |
Expand All @@ -3650,22 +3540,6 @@ _Appears in:_
| `status` | _[PolicyStatus](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1alpha2.PolicyStatus)_ | true | Status defines the current status of SecurityPolicy. |


#### SecurityPolicyList



SecurityPolicyList contains a list of SecurityPolicy resources.



| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `apiVersion` | _string_ | |`gateway.envoyproxy.io/v1alpha1`
| `kind` | _string_ | |`SecurityPolicyList`
| `metadata` | _[ListMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta)_ | true | Refer to Kubernetes API documentation for fields of `metadata`. |
| `items` | _[SecurityPolicy](#securitypolicy) array_ | true | |


#### SecurityPolicySpec


Expand Down
Loading

0 comments on commit 0454d0d

Please sign in to comment.