Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API: support max_retries in circuit breakers API #2773

Merged
merged 5 commits into from
Mar 5, 2024
Merged

API: support max_retries in circuit breakers API #2773

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eef695
support max_retries in circuit breakers API, remove retry_budget defa…
guydc Mar 4, 2024
c5ded22
add manifests
guydc Mar 4, 2024
0e8e167
remove CBs if not defined
guydc Mar 4, 2024
b54921c
fix cov, lint and json
guydc Mar 4, 2024
b11a8a5
enforce 1024 retry limit in xds translator
guydc Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions api/v1alpha1/circuitbreaker_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ type CircuitBreaker struct {
// +optional
MaxParallelRequests *int64 `json:"maxParallelRequests,omitempty"`

// The maximum number of parallel retries that Envoy will make to the referenced backend defined within a xRoute rule.
//
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=4294967295
// +kubebuilder:default=1024
// +optional
MaxParallelRetries *int64 `json:"maxParallelRetries,omitempty"`

// The maximum number of requests that Envoy will make over a single connection to the referenced backend defined within a xRoute rule.
// Default: unlimited.
//
Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ spec:
maximum: 4294967295
minimum: 0
type: integer
maxParallelRetries:
default: 1024
description: The maximum number of parallel retries that Envoy
will make to the referenced backend defined within a xRoute
rule.
format: int64
maximum: 4294967295
minimum: 0
type: integer
maxPendingRequests:
default: 1024
description: The maximum number of pending requests that Envoy
Expand Down
25 changes: 0 additions & 25 deletions internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,6 @@ xds:
dynamicActiveClusters:
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -695,11 +690,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -721,11 +711,6 @@ xds:
http2ProtocolOptions: {}
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -742,11 +727,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -763,11 +743,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand Down
5 changes: 0 additions & 5 deletions internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@ xds:
dynamicActiveClusters:
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand Down
55 changes: 0 additions & 55 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,17 +370,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand All @@ -403,17 +392,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand Down Expand Up @@ -444,17 +422,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand All @@ -477,17 +444,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand All @@ -510,17 +466,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand Down
25 changes: 0 additions & 25 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@ xds:
dynamicActiveClusters:
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -221,11 +216,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -247,11 +237,6 @@ xds:
http2ProtocolOptions: {}
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -268,11 +253,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -289,11 +269,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand Down
25 changes: 0 additions & 25 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ xds:
dynamicActiveClusters:
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -25,11 +20,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -51,11 +41,6 @@ xds:
http2ProtocolOptions: {}
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -72,11 +57,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -93,11 +73,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand Down
22 changes: 0 additions & 22 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,17 +262,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand All @@ -295,17 +284,6 @@
{
"cluster": {
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
"circuitBreakers": {
"thresholds": [
{
"retryBudget": {
"budgetPercent": {
"value": 100
}
}
}
]
},
"commonLbConfig": {
"localityWeightedLbConfig": {}
},
Expand Down
10 changes: 0 additions & 10 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,6 @@ xds:
dynamicActiveClusters:
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand All @@ -165,11 +160,6 @@ xds:
type: EDS
- cluster:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
circuitBreakers:
thresholds:
- retryBudget:
budgetPercent:
value: 100
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
Expand Down
Loading
Loading