xds: Deprecated http2_protocol_options (envoyproxy#974)

* xds: Deprecated http2_protocol_options Signed-off-by: hejianpeng <hejianpeng2@huawei.com> (cherry picked from commit 4a04915) Signed-off-by: Arko Dasgupta <arko@tetrate.io>
arkodg · Feb 10, 2023 · dd62f53 · dd62f53
1 parent a1efea4
commit dd62f53
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/internal/xds/translator/authentication.go b/internal/xds/translator/authentication.go
@@ -219,11 +219,11 @@ func buildClusterFromJwks(jwks *jwksCluster) (*cluster.Cluster, error) {
 				},
 			},
 		},
-		Http2ProtocolOptions: &core.Http2ProtocolOptions{},
-		DnsRefreshRate:       durationpb.New(30 * time.Second),
-		RespectDnsTtl:        true,
-		DnsLookupFamily:      cluster.Cluster_V4_ONLY,
-		TransportSocket:      tSocket,
+		TypedExtensionProtocolOptions: buildTypedExtensionProtocolOptions(),
+		DnsRefreshRate:                durationpb.New(30 * time.Second),
+		RespectDnsTtl:                 true,
+		DnsLookupFamily:               cluster.Cluster_V4_ONLY,
+		TransportSocket:               tSocket,
 	}, nil
 }
 

diff --git a/internal/xds/translator/ratelimit.go b/internal/xds/translator/ratelimit.go
@@ -292,10 +292,10 @@ func buildRateLimitServiceCluster(irListener *ir.HTTPListener) *cluster.Cluster
 				},
 			},
 		},
-		Http2ProtocolOptions: &core.Http2ProtocolOptions{},
-		DnsRefreshRate:       durationpb.New(30 * time.Second),
-		RespectDnsTtl:        true,
-		DnsLookupFamily:      cluster.Cluster_V4_ONLY,
+		TypedExtensionProtocolOptions: buildTypedExtensionProtocolOptions(),
+		DnsRefreshRate:                durationpb.New(30 * time.Second),
+		RespectDnsTtl:                 true,
+		DnsLookupFamily:               cluster.Cluster_V4_ONLY,
 	}
 	return rateLimitServerCluster
 }

diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.clusters.yaml
@@ -37,7 +37,6 @@
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: localhost_443
@@ -59,10 +58,14 @@
           trustedCa:
             filename: /etc/ssl/certs/ca-certificates.crt
   type: STATIC
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: localhost_8080
@@ -84,3 +87,8 @@
           trustedCa:
             filename: /etc/ssl/certs/ca-certificates.crt
   type: STATIC
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.clusters.yaml
@@ -37,7 +37,6 @@
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: localhost_443
@@ -59,3 +58,8 @@
           trustedCa:
             filename: /etc/ssl/certs/ca-certificates.crt
   type: STATIC
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-ratelimit.clusters.yaml
@@ -55,7 +55,6 @@
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: ratelimit_cluster
@@ -69,10 +68,14 @@
   name: ratelimit_cluster
   respectDnsTtl: true
   type: STRICT_DNS
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: localhost_443
@@ -94,3 +97,8 @@
           trustedCa:
             filename: /etc/ssl/certs/ca-certificates.crt
   type: STATIC
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-single-route-single-match.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-single-route-single-match.clusters.yaml
@@ -19,7 +19,6 @@
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: localhost_443
@@ -41,3 +40,8 @@
           trustedCa:
             filename: /etc/ssl/certs/ca-certificates.crt
   type: STATIC
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml
@@ -55,7 +55,6 @@
 - connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
-  http2ProtocolOptions: {}
   lbPolicy: RANDOM
   loadAssignment:
     clusterName: ratelimit_cluster
@@ -69,3 +68,8 @@
   name: ratelimit_cluster
   respectDnsTtl: true
   type: STRICT_DNS
+  typedExtensionProtocolOptions:
+    envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      explicitHttpConfig:
+        http2ProtocolOptions: {}