chore: fix http2_protocol_options warning message (envoyproxy#2048)

chore:fix http2_protocol_options warning message Signed-off-by: zhaonan <zhaonan06@corp.netease.com> (cherry picked from commit 179d265) Signed-off-by: Arko Dasgupta <arko@tetrate.io>
arkodg · Nov 1, 2023 · 36b8c8e · 36b8c8e
1 parent 42c1ac1
commit 36b8c8e
Show file tree

Hide file tree

Showing 21 changed files with 88 additions and 110 deletions.
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -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:

diff --git a/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml b/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml
@@ -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:

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -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"
+                          }
+                        }
                       }
                     }
                   }

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -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:

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
@@ -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:

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
@@ -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"
+                          }
+                        }
                       }
                     }
                   }

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
@@ -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:

diff --git a/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
@@ -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:

diff --git a/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
@@ -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:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
@@ -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:

diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl
@@ -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:

diff --git a/internal/xds/bootstrap/testdata/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/custom-stats-matcher.yaml
@@ -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:

diff --git a/internal/xds/bootstrap/testdata/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/disable-prometheus.yaml
@@ -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: