Use HTTP1.1 to connec to upstream jwks endpoint

Arko Dasgupta · Arko Dasgupta · commit d29613ca7a7a · 2023-02-03T11:35:34.000-08:00
Signed-off-by: Arko Dasgupta &lt;arko@tetrate.io&gt;
diff --git a/internal/xds/translator/authentication.go b/internal/xds/translator/authentication.go
@@ -219,11 +219,10 @@ func buildClusterFromJwks(jwks *jwksCluster) (*cluster.Cluster, error) {
 				},
 			},
 		},
-		TypedExtensionProtocolOptions: buildTypedExtensionProtocolOptions(),
-		DnsRefreshRate:                durationpb.New(30 * time.Second),
-		RespectDnsTtl:                 true,
-		DnsLookupFamily:               cluster.Cluster_V4_ONLY,
-		TransportSocket:               tSocket,
+		DnsRefreshRate:  durationpb.New(30 * time.Second),
+		RespectDnsTtl:   true,
+		DnsLookupFamily: cluster.Cluster_V4_ONLY,
+		TransportSocket: tSocket,
 	}, nil
 }
 
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
@@ -58,11 +58,6 @@
           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
@@ -87,8 +82,3 @@
           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
@@ -58,8 +58,3 @@
           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
@@ -97,8 +97,3 @@
           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
@@ -40,8 +40,3 @@
           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: {}
