Merge branch v3.4 into master
This commit is contained in:
commit
a092c4f535
63 changed files with 1081 additions and 665 deletions
|
|
@ -299,7 +299,6 @@ spec:
|
|||
type: object
|
||||
type: object
|
||||
strategy:
|
||||
default: wrr
|
||||
description: |-
|
||||
Strategy defines the load balancing strategy between the servers.
|
||||
Supported values are: wrr (Weighed round-robin) and p2c (Power of two choices).
|
||||
|
|
@ -1241,7 +1240,6 @@ spec:
|
|||
type: object
|
||||
type: object
|
||||
strategy:
|
||||
default: wrr
|
||||
description: |-
|
||||
Strategy defines the load balancing strategy between the servers.
|
||||
Supported values are: wrr (Weighed round-robin) and p2c (Power of two choices).
|
||||
|
|
@ -1268,7 +1266,7 @@ spec:
|
|||
as ranges by separating two codes with a dash (500-599),
|
||||
or a combination of the two (404,418,500-599).
|
||||
items:
|
||||
pattern: ^([0-5][0-9]{2}[,-]?)+$
|
||||
pattern: ^([1-5][0-9]{2}[,-]?)+$
|
||||
type: string
|
||||
type: array
|
||||
statusRewrites:
|
||||
|
|
@ -3022,7 +3020,6 @@ spec:
|
|||
type: object
|
||||
type: object
|
||||
strategy:
|
||||
default: wrr
|
||||
description: |-
|
||||
Strategy defines the load balancing strategy between the servers.
|
||||
Supported values are: wrr (Weighed round-robin) and p2c (Power of two choices).
|
||||
|
|
@ -3150,7 +3147,6 @@ spec:
|
|||
type: object
|
||||
type: object
|
||||
strategy:
|
||||
default: wrr
|
||||
description: |-
|
||||
Strategy defines the load balancing strategy between the servers.
|
||||
Supported values are: wrr (Weighed round-robin) and p2c (Power of two choices).
|
||||
|
|
@ -3365,7 +3361,6 @@ spec:
|
|||
type: object
|
||||
type: object
|
||||
strategy:
|
||||
default: wrr
|
||||
description: |-
|
||||
Strategy defines the load balancing strategy between the servers.
|
||||
Supported values are: wrr (Weighed round-robin) and p2c (Power of two choices).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue