Skip to content

Commit

Permalink
chore: fix http2_protocol_options warning message (envoyproxy#2048)
Browse files Browse the repository at this point in the history
chore:fix http2_protocol_options warning message

Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
tmsnan authored Oct 31, 2023

Verified

This commit was signed with the committer’s verified signature.
ImgBotApp Imgbot
1 parent 046a593 commit 179d265
Showing 21 changed files with 88 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -98,13 +98,12 @@ envoyProxy:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
@@ -510,10 +509,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -550,7 +545,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -42,10 +42,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -82,7 +78,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -72,12 +72,6 @@
},
{
"connectTimeout": "10s",
"http2ProtocolOptions": {
"connectionKeepalive": {
"interval": "30s",
"timeout": "5s"
}
},
"loadAssignment": {
"clusterName": "xds_cluster",
"endpoints": [
@@ -136,7 +130,12 @@
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicitHttpConfig": {
"http2ProtocolOptions": {}
"http2ProtocolOptions": {
"connectionKeepalive": {
"interval": "30s",
"timeout": "5s"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -42,10 +42,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -82,7 +78,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -41,10 +41,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -81,7 +77,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -72,12 +72,6 @@
},
{
"connectTimeout": "10s",
"http2ProtocolOptions": {
"connectionKeepalive": {
"interval": "30s",
"timeout": "5s"
}
},
"loadAssignment": {
"clusterName": "xds_cluster",
"endpoints": [
@@ -136,7 +130,12 @@
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicitHttpConfig": {
"http2ProtocolOptions": {}
"http2ProtocolOptions": {
"connectionKeepalive": {
"interval": "30s",
"timeout": "5s"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -42,10 +42,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -82,7 +78,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -41,10 +41,6 @@ xds:
name: prometheus_stats
type: STATIC
- connectTimeout: 10s
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
loadAssignment:
clusterName: xds_cluster
endpoints:
@@ -81,7 +77,10 @@ xds:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
http2ProtocolOptions:
connectionKeepalive:
interval: 30s
timeout: 5s
listeners:
- address:
socketAddress:
Original file line number Diff line number Diff line change
@@ -108,13 +108,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -108,13 +108,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -106,13 +106,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -104,13 +104,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -130,13 +130,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -106,13 +106,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
Original file line number Diff line number Diff line change
@@ -106,13 +106,12 @@ spec:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
9 changes: 4 additions & 5 deletions internal/xds/bootstrap/bootstrap.yaml.tpl
Original file line number Diff line number Diff line change
@@ -141,13 +141,12 @@ static_resources:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
9 changes: 4 additions & 5 deletions internal/xds/bootstrap/testdata/custom-stats-matcher.yaml
Original file line number Diff line number Diff line change
@@ -99,13 +99,12 @@ static_resources:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
9 changes: 4 additions & 5 deletions internal/xds/bootstrap/testdata/disable-prometheus.yaml
Original file line number Diff line number Diff line change
@@ -67,13 +67,12 @@ static_resources:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
9 changes: 4 additions & 5 deletions internal/xds/bootstrap/testdata/enable-prometheus.yaml
Original file line number Diff line number Diff line change
@@ -89,13 +89,12 @@ static_resources:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
9 changes: 4 additions & 5 deletions internal/xds/bootstrap/testdata/otel-metrics.yaml
Original file line number Diff line number Diff line change
@@ -92,13 +92,12 @@ static_resources:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
explicit_http_config:
http2_protocol_options: {}
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
name: xds_cluster
type: STRICT_DNS
http2_protocol_options:
connection_keepalive:
interval: 30s
timeout: 5s
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
1 change: 0 additions & 1 deletion internal/xds/translator/cluster_test.go
Original file line number Diff line number Diff line change
@@ -41,7 +41,6 @@ func TestBuildXdsCluster(t *testing.T) {
require.Equal(t, bootstrapXdsCluster.TransportSocket, dynamicXdsCluster.TransportSocket)
assert.True(t, proto.Equal(bootstrapXdsCluster.TransportSocket, dynamicXdsCluster.TransportSocket))
assert.True(t, proto.Equal(bootstrapXdsCluster.ConnectTimeout, dynamicXdsCluster.ConnectTimeout))
assert.True(t, proto.Equal(bootstrapXdsCluster.TypedExtensionProtocolOptions[extensionOptionsKey], dynamicXdsCluster.TypedExtensionProtocolOptions[extensionOptionsKey]))
}

func TestBuildXdsClusterLoadAssignment(t *testing.T) {

0 comments on commit 179d265

Please sign in to comment.