From 5b7bbb9de5d695f4ffc0d057b6fdc728e4bf469a Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" Date: Wed, 5 Aug 2020 15:00:24 -0500 Subject: [PATCH] xds: revert setting set_node_on_first_message_only to true when generating envoy bootstrap config (#8440) When consul is restarted and an envoy that had already sent DiscoveryRequests to the previous consul process sends a request to the new process it doesn't respect the setting and never populates DiscoveryRequest.Node for the life of the new consul process due to this bug: https://github.com/envoyproxy/envoy/issues/9682 Fixes #8430 --- command/connect/envoy/bootstrap_tpl.go | 1 - .../CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden | 1 - command/connect/envoy/testdata/access-log-path.golden | 1 - command/connect/envoy/testdata/defaults.golden | 1 - command/connect/envoy/testdata/existing-ca-file.golden | 1 - command/connect/envoy/testdata/extra_-multiple.golden | 1 - command/connect/envoy/testdata/extra_-single.golden | 1 - command/connect/envoy/testdata/grpc-addr-config.golden | 1 - command/connect/envoy/testdata/grpc-addr-env.golden | 1 - command/connect/envoy/testdata/grpc-addr-flag.golden | 1 - command/connect/envoy/testdata/grpc-addr-unix.golden | 1 - .../envoy/testdata/ingress-gateway-address-specified.golden | 1 - .../envoy/testdata/ingress-gateway-no-auto-register.golden | 1 - .../ingress-gateway-register-with-service-and-proxy-id.golden | 1 - ...ingress-gateway-register-with-service-without-proxy-id.golden | 1 - command/connect/envoy/testdata/ingress-gateway.golden | 1 - command/connect/envoy/testdata/stats-config-override.golden | 1 - command/connect/envoy/testdata/token-arg.golden | 1 - command/connect/envoy/testdata/token-env.golden | 1 - command/connect/envoy/testdata/token-file-arg.golden | 1 - command/connect/envoy/testdata/token-file-env.golden | 1 - command/connect/envoy/testdata/zipkin-tracing-config.golden | 1 - 22 files changed, 22 deletions(-) diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index 3f65146831..bbd87a23cc 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -188,7 +188,6 @@ const bootstrapTemplate = `{ "cds_config": { "ads": {} }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden index d877c3f1a1..81835fe44f 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden @@ -97,7 +97,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 5bb82282b7..f09f7ed2b4 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 62282b8c7a..f7e414862f 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 0f0f3fee6a..363f4eb101 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -97,7 +97,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index cf18c4b8b0..2199b4e6b7 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -110,7 +110,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 447eed876c..5e07dd098f 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -101,7 +101,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index 621668c93b..973f6a82b9 100644 --- a/command/connect/envoy/testdata/grpc-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-addr-config.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 621668c93b..973f6a82b9 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 621668c93b..973f6a82b9 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 37e57cba13..2ff8134770 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -87,7 +87,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index 0ec801bef1..e141aff331 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -161,7 +161,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden index 7799b24e15..d08041ae1e 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -161,7 +161,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { 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 index d08ba0e6bd..022c5db1fa 100644 --- 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 @@ -161,7 +161,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { 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 index 183421153a..d1658a8b11 100644 --- 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 @@ -161,7 +161,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 957e96c2d7..99a4109e08 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -161,7 +161,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 3b900f6201..8f3f50e9b2 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -46,7 +46,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 9e5f4756a7..0f52e78c9a 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 9e5f4756a7..0f52e78c9a 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 9e5f4756a7..0f52e78c9a 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 9e5f4756a7..0f52e78c9a 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -88,7 +88,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 7f28ef8ef6..db1fdf9b76 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -121,7 +121,6 @@ }, "ads_config": { "api_type": "GRPC", - "set_node_on_first_message_only": true, "grpc_services": { "initial_metadata": [ {