update envoy proxy sha (#35120)

* update envoy proxy sha * update proxy sha * revert telemety test hack * Update to write host header in destination * Revert "revert telemety test hack" This reverts commit 0d34c76fe585a5e2d82e1bb987a3f4f357345f3e. * fix telemetry test * remove telemety test hack This reverts commit e75060360265d7f0a9a444fdcfc72d4258dee33d. * update telemetry fix * update telemetry fix * update Co-authored-by: John Howard <howardjohn@google.com>
rh-bjeon · Oct 25, 2021 · ba9125f · ba9125f
1 parent 177add2
commit ba9125f
Show file tree

Hide file tree

Showing 26 changed files with 226 additions and 26 deletions.
diff --git a/istio.deps b/istio.deps
@@ -4,6 +4,6 @@
     "name": "PROXY_REPO_SHA",
     "repoName": "proxy",
     "file": "",
-    "lastStableSHA": "74393cf764c167b545f32eb895314e624186e5b6"
+    "lastStableSHA": "cf1ff904e66d960d97c7b902c22e3e54b9d4d1ca"
   }
 ]
diff --git a/pilot/pkg/networking/core/v1alpha3/route/route.go b/pilot/pkg/networking/core/v1alpha3/route/route.go
@@ -544,11 +544,22 @@ func translateRoute(
 				Weight: weight,
 			}
 			if dst.Headers != nil {
-				operations := translateHeadersOperationsForDestination(dst.Headers)
+				var operations headersOperations
+				// https://github.com/envoyproxy/envoy/issues/16775 Until 1.12, we could not rewrite authority in weighted cluster
+				if util.IsIstioVersionGE112(node.IstioVersion) {
+					operations = translateHeadersOperations(dst.Headers)
+				} else {
+					operations = translateHeadersOperationsForDestination(dst.Headers)
+				}
 				clusterWeight.RequestHeadersToAdd = operations.requestHeadersToAdd
 				clusterWeight.RequestHeadersToRemove = operations.requestHeadersToRemove
 				clusterWeight.ResponseHeadersToAdd = operations.responseHeadersToAdd
 				clusterWeight.ResponseHeadersToRemove = operations.responseHeadersToRemove
+				if operations.authority != "" {
+					clusterWeight.HostRewriteSpecifier = &route.WeightedCluster_ClusterWeight_HostRewriteLiteral{
+						HostRewriteLiteral: operations.authority,
+					}
+				}
 			}
 
 			weighted = append(weighted, clusterWeight)
@@ -566,6 +577,16 @@ func translateRoute(
 			out.RequestHeadersToRemove = append(out.RequestHeadersToRemove, weighted[0].RequestHeadersToRemove...)
 			out.ResponseHeadersToAdd = append(out.ResponseHeadersToAdd, weighted[0].ResponseHeadersToAdd...)
 			out.ResponseHeadersToRemove = append(out.ResponseHeadersToRemove, weighted[0].ResponseHeadersToRemove...)
+			if weighted[0].HostRewriteSpecifier != nil && action.HostRewriteSpecifier == nil {
+				// Ideally, if the weighted cluster overwrites authority, it has precedence. This mirrors behavior of headers,
+				// because for headers we append the weighted last which allows it to Set and wipe out previous Adds.
+				// However, Envoy behavior is different when we set at both cluster level and route level, and we want
+				// behavior to be consistent with a single cluster and multiple clusters.
+				// As a result, we only override if the top level rewrite is not set
+				action.HostRewriteSpecifier = &route.RouteAction_HostRewriteLiteral{
+					HostRewriteLiteral: weighted[0].GetHostRewriteLiteral(),
+				}
+			}
 		} else {
 			action.ClusterSpecifier = &route.RouteAction_WeightedClusters{
 				WeightedClusters: &route.WeightedCluster{
@@ -719,7 +740,6 @@ func dropInternal(keys []string) []string {
 }
 
 // translateHeadersOperationsForDestination translates headers operations for a HTTPRouteDestination
-// TODO(https://github.com/envoyproxy/envoy/issues/16775) merge with translateHeadersOperations
 func translateHeadersOperationsForDestination(headers *networking.Headers) headersOperations {
 	req := headers.GetRequest()
 	resp := headers.GetResponse()

diff --git a/pkg/bootstrap/testdata/all_golden.json b/pkg/bootstrap/testdata/all_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/auth_golden.json b/pkg/bootstrap/testdata/auth_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/authsds_golden.json b/pkg/bootstrap/testdata/authsds_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/default_golden.json b/pkg/bootstrap/testdata/default_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/metrics_no_statsd_golden.json b/pkg/bootstrap/testdata/metrics_no_statsd_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/running_golden.json b/pkg/bootstrap/testdata/running_golden.json
@@ -19,7 +19,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -248,6 +248,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/runningsds_golden.json b/pkg/bootstrap/testdata/runningsds_golden.json
@@ -19,7 +19,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -248,6 +248,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/stats_inclusion_golden.json b/pkg/bootstrap/testdata/stats_inclusion_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -333,6 +333,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "safe_regex": {"google_re2":{}, "regex":"http.[0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*_8080.downstream_rq_time"}
           },
           {

diff --git a/pkg/bootstrap/testdata/tracing_datadog_golden.json b/pkg/bootstrap/testdata/tracing_datadog_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_lightstep_golden.json b/pkg/bootstrap/testdata/tracing_lightstep_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json b/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_stackdriver_golden.json b/pkg/bootstrap/testdata/tracing_stackdriver_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json b/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_tls_golden.json b/pkg/bootstrap/testdata/tracing_tls_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_zipkin_golden.json b/pkg/bootstrap/testdata/tracing_zipkin_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/xdsproxy_golden.json b/pkg/bootstrap/testdata/xdsproxy_golden.json
@@ -14,7 +14,7 @@
                   "envoy.deprecated_features:envoy.config.listener.v3.Listener.hidden_envoy_deprecated_use_original_dst": true,
                   "envoy.reloadable_features.require_strict_1xx_and_204_response_headers": false,
                   "re2.max_program_size.error_level": 1024,
-                  "envoy.reloadable_features.treat_host_like_authority": false
+                  "envoy.reloadable_features.http_reject_path_with_fragment": false
               }
           },
           {
@@ -243,6 +243,9 @@
           "suffix": "shadow_denied"
           },
           {
+          "suffix": "downstream_cx_active"
+          },
+          {
           "prefix": "component"
           }
         ]