Backport of NET-6942 - Replace usage of deprecated Envoy field envoy.…

…config.cluster.v3.Cluster.http_protocol_options. into release/1.15.x (#20031) fix formatting issue in envoy bootstrapping Co-authored-by: John Murret <john.murret@hashicorp.com>
hashicorp · Dec 21, 2023 · 3b70b66 · 3b70b66
1 parent c56fcac
commit 3b70b66
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 17 deletions.
diff --git a/.changelog/20010.txt b/.changelog/20010.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+xds: Replace usage of deprecated Envoy field `envoy.config.cluster.v3.Cluster.http_protocol_options`
+```
diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go
@@ -650,7 +650,14 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
 		"ignore_health_on_host_removal": false,
 		"connect_timeout": "5s",
 		"type": "STATIC",
-		"http_protocol_options": {},
+		"typed_extension_protocol_options": {
+			"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+				"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+				"explicit_http_config": {
+					"http_protocol_options": {}
+				}
+			}
+		},
 		"loadAssignment": {
 			"clusterName": "` + clusterName + `",
 			"endpoints": [

diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go
@@ -18,7 +18,14 @@ const (
   "ignore_health_on_host_removal": false,
   "connect_timeout": "5s",
   "type": "STATIC",
-  "http_protocol_options": {},
+  "typed_extension_protocol_options": {
+	"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+      "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+      "explicit_http_config": {
+        "http_protocol_options": {}
+      }
+    }
+  },
   "loadAssignment": {
     "clusterName": "self_admin",
     "endpoints": [
@@ -44,7 +51,14 @@ const (
   "ignore_health_on_host_removal": false,
   "connect_timeout": "5s",
   "type": "STATIC",
-  "http_protocol_options": {},
+  "typed_extension_protocol_options": {
+    "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+	  "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+      "explicit_http_config": {
+        "http_protocol_options": {}
+      }
+    }
+  },
   "loadAssignment": {
     "clusterName": "self_admin",
     "endpoints": [
@@ -70,7 +84,14 @@ const (
   "ignore_health_on_host_removal": false,
   "connect_timeout": "5s",
   "type": "STATIC",
-  "http_protocol_options": {},
+  "typed_extension_protocol_options": {
+	"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+	 "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+	 "explicit_http_config": {
+	  "http_protocol_options": {}
+	 }
+	}
+   },
   "loadAssignment": {
     "clusterName": "prometheus_backend",
     "endpoints": [

diff --git a/command/connect/envoy/testdata/envoy-readiness-probe.golden b/command/connect/envoy/testdata/envoy-readiness-probe.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
@@ -75,7 +75,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "self_admin",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "prometheus_backend",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "prometheus_backend",
           "endpoints": [

diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden
@@ -74,7 +74,14 @@
         "ignore_health_on_host_removal": false,
         "connect_timeout": "5s",
         "type": "STATIC",
-        "http_protocol_options": {},
+        "typed_extension_protocol_options": {
+          "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+            "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+            "explicit_http_config": {
+              "http_protocol_options": {}
+            }
+          }
+        },
         "loadAssignment": {
           "clusterName": "prometheus_backend",
           "endpoints": [

diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go
@@ -25,9 +25,9 @@ func TestEnvoy(t *testing.T) {
 			caseDir := "CASE_DIR=" + tc
 
 			t.Cleanup(func() {
-				if t.Failed() {
-					runCmd(t, "capture_logs", caseDir)
-				}
+				//if t.Failed() {
+				runCmd(t, "capture_logs", caseDir)
+				//}
 
 				runCmd(t, "test_teardown", caseDir)
 			})