From c2174260bc59b0e8dc4b8fd8a174f301e49c7650 Mon Sep 17 00:00:00 2001
From: Paul Banks <pbanks@hashicorp.com>
Date: Fri, 27 Aug 2021 21:28:01 +0100
Subject: [PATCH] Fix integration test for older Envoy versions

---
 .../service_gateway.hcl                       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
index 1e3073a8d..a4c3547e4 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
@@ -4,18 +4,22 @@ services {
 
   proxy {
     config {
+      # Note that http2_protocol_options is a deprecated field and Envoy 1.17
+      # and up would prefer:
+      #     typed_extension_protocol_options:
+      #       envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+      #         "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+      #         explicit_http_config:
+      #           http2_protocol_options:
+      #
+      # But that breaks 1.15 and 1.16. For now use this which is supported by
+      # all our supported versions# to avoid needing to setup different
+      # bootstrap based on the envoy version.
       envoy_extra_static_clusters_json = <<EOF
 {
   "name": "sds-cluster",
   "connect_timeout": "5s",
-  "typed_extension_protocol_options": {
-    "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": {},
   "load_assignment": {
     "cluster_name": "sds-cluster",
     "endpoints": [