Skip to content

Commit

Permalink
Protocol Detection Timeout (istio#1033)
Browse files Browse the repository at this point in the history
* Protocol Detection Timeout

Signed-off-by: Shriram Rajagopalan <rshriram@tetrate.io>

* proto commit

Signed-off-by: Shriram Rajagopalan <rshriram@tetrate.io>
  • Loading branch information
rshriram authored Aug 13, 2019
1 parent 3a122a9 commit 93fc23a
Show file tree
Hide file tree
Showing 6 changed files with 275 additions and 159 deletions.
279 changes: 176 additions & 103 deletions mesh/v1alpha1/config.pb.go

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion mesh/v1alpha1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ message MeshConfig {
// Connection timeout used by Envoy. (MUST BE >=1ms)
google.protobuf.Duration connect_timeout = 6;

// Automatic protocol detection uses a set of heuristics to
// determine whether the connection is using TLS or not (on the
// server side), as well as the application protocol being used
// (e.g., http vs tcp). These heuristics rely on the client sending
// the first bits of data. For server first protocols like MySQL,
// MongoDB, etc., Envoy will timeout on the protocol detection after
// the specified period, defaulting to non mTLS plain TCP
// traffic. Set this field to tweak the period that Envoy will wait
// for the client to send the first bits of data. (MUST BE >=1ms)
google.protobuf.Duration protocol_detection_timeout = 42;

// If set then set SO_KEEPALIVE on the socket to enable TCP Keepalives.
istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive tcp_keepalive = 28;

Expand Down Expand Up @@ -307,7 +318,7 @@ message MeshConfig {
H2UpgradePolicy h2_upgrade_policy = 41;

// $hide_from_docs
// Next available field number: 42
// Next available field number: 43
}

// ConfigSource describes information about a configuration store inside a
Expand Down
3 changes: 3 additions & 0 deletions mesh/v1alpha1/istio.mesh.v1alpha1.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
"type": "integer",
"format": "int32"
},
"protocolDetectionTimeout": {
"$ref": "#/components/schemas/google.protobuf.Duration"
},
"ingressClass": {
"description": "Class of ingress resources to be processed by Istio ingress controller. This corresponds to the value of \"kubernetes.io/ingress.class\" annotation.",
"type": "string",
Expand Down
16 changes: 16 additions & 0 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html

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

5 changes: 5 additions & 0 deletions proto.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,11 @@
"name": "connect_timeout",
"type": "google.protobuf.Duration"
},
{
"id": 42,
"name": "protocol_detection_timeout",
"type": "google.protobuf.Duration"
},
{
"id": 28,
"name": "tcp_keepalive",
Expand Down
Loading

0 comments on commit 93fc23a

Please sign in to comment.