diff --git a/apis/projectcontour/v1/httpproxy.go b/apis/projectcontour/v1/httpproxy.go index 72ff28096d2..1978f8667f1 100644 --- a/apis/projectcontour/v1/httpproxy.go +++ b/apis/projectcontour/v1/httpproxy.go @@ -1146,7 +1146,7 @@ type TimeoutPolicy struct { } // RetryOn is a string type alias with validation to ensure that the value is valid. -// +kubebuilder:validation:Enum="5xx";gateway-error;reset;connect-failure;retriable-4xx;refused-stream;retriable-status-codes;retriable-headers;cancelled;deadline-exceeded;internal;resource-exhausted;unavailable +// +kubebuilder:validation:Enum="5xx";gateway-error;reset;reset-before-request;connect-failure;envoy-ratelimited;retriable-4xx;refused-stream;retriable-status-codes;retriable-headers;http3-post-connect-failure;cancelled;deadline-exceeded;internal;resource-exhausted;unavailable type RetryOn string // RetryPolicy defines the attributes associated with retrying policy. @@ -1171,11 +1171,14 @@ type RetryPolicy struct { // - `5xx` // - `gateway-error` // - `reset` + // - `reset-before-request` // - `connect-failure` + // - `envoy-ratelimited` // - `retriable-4xx` // - `refused-stream` // - `retriable-status-codes` // - `retriable-headers` + // - `http3-post-connect-failure` // // Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): // diff --git a/changelogs/unreleased/6772-tsaarni-small.md b/changelogs/unreleased/6772-tsaarni-small.md new file mode 100644 index 00000000000..720811a224f --- /dev/null +++ b/changelogs/unreleased/6772-tsaarni-small.md @@ -0,0 +1 @@ +Added conditions `reset-before-request`, `envoy-ratelimited` and `http3-post-connect-failure` for `httpproxy.spec.routes.retryPolicy.retryOn`, see Envoy [documentation](https://www.envoyproxy.io/docs/envoy/v1.32.0/configuration/http/http_filters/router_filter#config-http-filters-router-x-envoy-retry-on) for more details. diff --git a/examples/contour/01-crds.yaml b/examples/contour/01-crds.yaml index 2319e19c962..c1f6eacc65b 100644 --- a/examples/contour/01-crds.yaml +++ b/examples/contour/01-crds.yaml @@ -6702,11 +6702,14 @@ spec: - `5xx` - `gateway-error` - `reset` + - `reset-before-request` - `connect-failure` + - `envoy-ratelimited` - `retriable-4xx` - `refused-stream` - `retriable-status-codes` - `retriable-headers` + - `http3-post-connect-failure` Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): - `cancelled` - `deadline-exceeded` @@ -6720,11 +6723,14 @@ spec: - 5xx - gateway-error - reset + - reset-before-request - connect-failure + - envoy-ratelimited - retriable-4xx - refused-stream - retriable-status-codes - retriable-headers + - http3-post-connect-failure - cancelled - deadline-exceeded - internal diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index a2db3e69e2a..1b89dcd4a1c 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -6922,11 +6922,14 @@ spec: - `5xx` - `gateway-error` - `reset` + - `reset-before-request` - `connect-failure` + - `envoy-ratelimited` - `retriable-4xx` - `refused-stream` - `retriable-status-codes` - `retriable-headers` + - `http3-post-connect-failure` Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): - `cancelled` - `deadline-exceeded` @@ -6940,11 +6943,14 @@ spec: - 5xx - gateway-error - reset + - reset-before-request - connect-failure + - envoy-ratelimited - retriable-4xx - refused-stream - retriable-status-codes - retriable-headers + - http3-post-connect-failure - cancelled - deadline-exceeded - internal diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml index ec9255a644d..31b631cca9a 100644 --- a/examples/render/contour-gateway-provisioner.yaml +++ b/examples/render/contour-gateway-provisioner.yaml @@ -6713,11 +6713,14 @@ spec: - `5xx` - `gateway-error` - `reset` + - `reset-before-request` - `connect-failure` + - `envoy-ratelimited` - `retriable-4xx` - `refused-stream` - `retriable-status-codes` - `retriable-headers` + - `http3-post-connect-failure` Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): - `cancelled` - `deadline-exceeded` @@ -6731,11 +6734,14 @@ spec: - 5xx - gateway-error - reset + - reset-before-request - connect-failure + - envoy-ratelimited - retriable-4xx - refused-stream - retriable-status-codes - retriable-headers + - http3-post-connect-failure - cancelled - deadline-exceeded - internal diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index a121a0e0872..f37bdc1a9b5 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -6738,11 +6738,14 @@ spec: - `5xx` - `gateway-error` - `reset` + - `reset-before-request` - `connect-failure` + - `envoy-ratelimited` - `retriable-4xx` - `refused-stream` - `retriable-status-codes` - `retriable-headers` + - `http3-post-connect-failure` Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): - `cancelled` - `deadline-exceeded` @@ -6756,11 +6759,14 @@ spec: - 5xx - gateway-error - reset + - reset-before-request - connect-failure + - envoy-ratelimited - retriable-4xx - refused-stream - retriable-status-codes - retriable-headers + - http3-post-connect-failure - cancelled - deadline-exceeded - internal diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index 190b4c5999a..5361950a894 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -6922,11 +6922,14 @@ spec: - `5xx` - `gateway-error` - `reset` + - `reset-before-request` - `connect-failure` + - `envoy-ratelimited` - `retriable-4xx` - `refused-stream` - `retriable-status-codes` - `retriable-headers` + - `http3-post-connect-failure` Supported [gRPC conditions](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on): - `cancelled` - `deadline-exceeded` @@ -6940,11 +6943,14 @@ spec: - 5xx - gateway-error - reset + - reset-before-request - connect-failure + - envoy-ratelimited - retriable-4xx - refused-stream - retriable-status-codes - retriable-headers + - http3-post-connect-failure - cancelled - deadline-exceeded - internal diff --git a/site/content/docs/main/config/api-reference.html b/site/content/docs/main/config/api-reference.html index 57bc87795fd..ad1062f70d4 100644 --- a/site/content/docs/main/config/api-reference.html +++ b/site/content/docs/main/config/api-reference.html @@ -3518,11 +3518,14 @@

RetryPolicy
  • 5xx
  • gateway-error
  • reset
  • +
  • reset-before-request
  • connect-failure
  • +
  • envoy-ratelimited
  • retriable-4xx
  • refused-stream
  • retriable-status-codes
  • retriable-headers
  • +
  • http3-post-connect-failure
  • Supported gRPC conditions: