From 0fc4fc642942b71223b04cd958f801fbfeab00ac Mon Sep 17 00:00:00 2001 From: Freddy Date: Fri, 28 Apr 2023 15:23:55 -0600 Subject: [PATCH] Revert "[CC-4519] Include Consul NodeID in Envoy bootstrap metadata" (#17191) --- command/connect/envoy/bootstrap_tpl.go | 4 ---- command/connect/envoy/envoy.go | 6 ------ command/connect/envoy/envoy_test.go | 1 - .../CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden | 1 - ...P_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden | 1 - command/connect/envoy/testdata/access-log-path.golden | 1 - .../envoy/testdata/access-logs-enabled-custom.golden | 1 - command/connect/envoy/testdata/access-logs-enabled.golden | 1 - command/connect/envoy/testdata/acl-enabled-and-token.golden | 1 - .../connect/envoy/testdata/acl-enabled-but-no-token.golden | 1 - ...L_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden | 1 - ...HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden | 1 - command/connect/envoy/testdata/defaults-nodemeta.golden | 1 - command/connect/envoy/testdata/defaults.golden | 1 - .../envoy/testdata/deprecated-grpc-addr-config.golden | 1 - command/connect/envoy/testdata/envoy-readiness-probe.golden | 1 - command/connect/envoy/testdata/existing-ca-file.golden | 1 - command/connect/envoy/testdata/existing-ca-path.golden | 1 - command/connect/envoy/testdata/extra_-multiple.golden | 1 - command/connect/envoy/testdata/extra_-single.golden | 1 - command/connect/envoy/testdata/grpc-addr-env.golden | 1 - command/connect/envoy/testdata/grpc-addr-flag.golden | 1 - .../connect/envoy/testdata/grpc-addr-unix-with-tls.golden | 1 - command/connect/envoy/testdata/grpc-addr-unix.golden | 1 - command/connect/envoy/testdata/grpc-tls-addr-config.golden | 1 - command/connect/envoy/testdata/hcp-metrics.golden | 1 - .../envoy/testdata/ingress-gateway-address-specified.golden | 1 - .../envoy/testdata/ingress-gateway-no-auto-register.golden | 1 - .../connect/envoy/testdata/ingress-gateway-nodemeta.golden | 1 - ...ngress-gateway-register-with-service-and-proxy-id.golden | 1 - ...ss-gateway-register-with-service-without-proxy-id.golden | 1 - command/connect/envoy/testdata/ingress-gateway.golden | 1 - .../envoy/testdata/prometheus-metrics-tls-ca-file.golden | 1 - .../envoy/testdata/prometheus-metrics-tls-ca-path.golden | 1 - command/connect/envoy/testdata/prometheus-metrics.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/xds-addr-config.golden | 1 - command/connect/envoy/testdata/zipkin-tracing-config.golden | 1 - 42 files changed, 50 deletions(-) diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index 9cce86c6b9..78d88f9b1d 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -17,9 +17,6 @@ type BootstrapTplArgs struct { // the agent to deliver the correct configuration. ProxyID string - // NodeID is the ID of the node on which the proxy service instance is registered. - NodeID string - // NodeName is the name of the node on which the proxy service instance is registered. NodeName string @@ -187,7 +184,6 @@ const bootstrapTemplate = `{ {{- if .NodeName }} "node_name": "{{ .NodeName }}", {{- end }} - "node_id": "{{ .NodeID }}", "namespace": "{{if ne .Namespace ""}}{{ .Namespace }}{{else}}default{{end}}", "partition": "{{if ne .Partition ""}}{{ .Partition }}{{else}}default{{end}}" } diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 06f5963e09..4c1ff6b80a 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -722,12 +722,6 @@ func (c *cmd) generateConfig() ([]byte, error) { args.Datacenter = datacenter } - info, err := c.client.Agent().Self() - if err != nil { - return nil, err - } - args.NodeID, _ = info["Config"]["NodeID"].(string) - if err := generateAccessLogs(c, args); err != nil { return nil, err } diff --git a/command/connect/envoy/envoy_test.go b/command/connect/envoy/envoy_test.go index f655a2e906..ebfc306311 100644 --- a/command/connect/envoy/envoy_test.go +++ b/command/connect/envoy/envoy_test.go @@ -1691,7 +1691,6 @@ func testMockAgentSelf( resp := agent.Self{ Config: map[string]interface{}{ "Datacenter": "dc1", - "NodeID": "7cbef9fc-4fb1-4c84-b100-689db9755449", }, } diff --git a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden index 22680a5eb7..a8ba4704f5 100644 --- a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden index bac5b1d0f6..5485256b4f 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index f25ab92cf5..18a28a491e 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-logs-enabled-custom.golden b/command/connect/envoy/testdata/access-logs-enabled-custom.golden index 1f42d1450e..6af720bdac 100644 --- a/command/connect/envoy/testdata/access-logs-enabled-custom.golden +++ b/command/connect/envoy/testdata/access-logs-enabled-custom.golden @@ -25,7 +25,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-logs-enabled.golden b/command/connect/envoy/testdata/access-logs-enabled.golden index 2a1a40947d..892cf46324 100644 --- a/command/connect/envoy/testdata/access-logs-enabled.golden +++ b/command/connect/envoy/testdata/access-logs-enabled.golden @@ -47,7 +47,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/acl-enabled-and-token.golden b/command/connect/envoy/testdata/acl-enabled-and-token.golden index 5694e08e1e..3342f03904 100644 --- a/command/connect/envoy/testdata/acl-enabled-and-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-and-token.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden index bac5b1d0f6..5485256b4f 100644 --- a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden index 22680a5eb7..a8ba4704f5 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden index bac5b1d0f6..5485256b4f 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/defaults-nodemeta.golden b/command/connect/envoy/testdata/defaults-nodemeta.golden index 3371495e81..41788c3c42 100644 --- a/command/connect/envoy/testdata/defaults-nodemeta.golden +++ b/command/connect/envoy/testdata/defaults-nodemeta.golden @@ -13,7 +13,6 @@ "id": "test-proxy", "metadata": { "node_name": "test-node", - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index bac5b1d0f6..5485256b4f 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden index 303950c696..ab87aa9b43 100644 --- a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden +++ b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/envoy-readiness-probe.golden b/command/connect/envoy/testdata/envoy-readiness-probe.golden index 799d93afb0..444528e880 100644 --- a/command/connect/envoy/testdata/envoy-readiness-probe.golden +++ b/command/connect/envoy/testdata/envoy-readiness-probe.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 22680a5eb7..a8ba4704f5 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index b82331d4e7..e246dbb324 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 84306e6ce7..038e65d8d9 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 84dcb8081c..14b8f08205 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 303950c696..ab87aa9b43 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 303950c696..ab87aa9b43 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden index 118a98d116..89764c310a 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 41e515b69d..eb8841ae99 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-tls-addr-config.golden b/command/connect/envoy/testdata/grpc-tls-addr-config.golden index 1de20dd5d2..e79cf0455d 100644 --- a/command/connect/envoy/testdata/grpc-tls-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-tls-addr-config.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/hcp-metrics.golden b/command/connect/envoy/testdata/hcp-metrics.golden index dbae64eecf..563d662e44 100644 --- a/command/connect/envoy/testdata/hcp-metrics.golden +++ b/command/connect/envoy/testdata/hcp-metrics.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index ecbf44d3fa..cc2e504eaf 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -12,7 +12,6 @@ "cluster": "ingress-gateway", "id": "ingress-gateway", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } 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 d0a9bfe539..cddaa490dd 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -12,7 +12,6 @@ "cluster": "ingress-gateway", "id": "ingress-gateway", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden index 484d926982..d79739ed72 100644 --- a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden +++ b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden @@ -13,7 +13,6 @@ "id": "ingress-gateway-1", "metadata": { "node_name": "test-node", - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } 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 72b6bdae73..3149fc4b33 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 @@ -12,7 +12,6 @@ "cluster": "my-gateway-123", "id": "my-gateway-123", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } 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 a2dd34310f..f8eb447541 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 @@ -12,7 +12,6 @@ "cluster": "my-gateway", "id": "my-gateway", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 102a1dfaae..c4fba520ed 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -12,7 +12,6 @@ "cluster": "ingress-gateway-1", "id": "ingress-gateway-1", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden index 077745bf53..71b82250e3 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden index f1683a870a..07e56ae878 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index 4276c54ca5..5adc8a9485 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 0409b321b8..d2a2371f20 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 7f83eff984..ac057e9a60 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 7f83eff984..ac057e9a60 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 7f83eff984..ac057e9a60 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 7f83eff984..ac057e9a60 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/xds-addr-config.golden b/command/connect/envoy/testdata/xds-addr-config.golden index 303950c696..ab87aa9b43 100644 --- a/command/connect/envoy/testdata/xds-addr-config.golden +++ b/command/connect/envoy/testdata/xds-addr-config.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 7fa56c3301..fd52f5ae3f 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -12,7 +12,6 @@ "cluster": "test", "id": "test-proxy", "metadata": { - "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" }