Skip to content

Revert "[1.15.x][CC-4519] Include Consul NodeID in Envoy bootstrap metadata" #17192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freddygv merged 1 commit into from
Apr 28, 2023
Merged

Revert "[1.15.x][CC-4519] Include Consul NodeID in Envoy bootstrap metadata" #17192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions command/connect/envoy/bootstrap_tpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,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

Expand Down Expand Up @@ -184,7 +181,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}}"
}
Expand Down
6 changes: 0 additions & 6 deletions command/connect/envoy/envoy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,12 +719,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
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/envoy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,6 @@ func testMockAgentSelf(
resp := agent.Self{
Config: map[string]interface{}{
"Datacenter": "dc1",
"NodeID": "7cbef9fc-4fb1-4c84-b100-689db9755449",
},
}

Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion ...connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/access-log-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/access-logs-enabled-custom.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/access-logs-enabled.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/acl-enabled-and-token.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/acl-enabled-but-no-token.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion ...connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion ...nnect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/defaults-nodemeta.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"id": "test-proxy",
"metadata": {
"node_name": "test-node",
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/defaults.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/envoy-readiness-probe.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/existing-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/existing-ca-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/extra_-multiple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/extra_-single.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/grpc-addr-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/grpc-addr-flag.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/grpc-addr-unix.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/grpc-tls-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/hcp-metrics.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-address-specified.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "ingress-gateway",
"id": "ingress-gateway",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "ingress-gateway",
"id": "ingress-gateway",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"id": "ingress-gateway-1",
"metadata": {
"node_name": "test-node",
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "my-gateway-123",
"id": "my-gateway-123",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "my-gateway",
"id": "my-gateway",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "ingress-gateway-1",
"id": "ingress-gateway-1",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/stats-config-override.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/token-arg.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/token-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/token-file-arg.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/token-file-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/xds-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down
1 change: 0 additions & 1 deletion command/connect/envoy/testdata/zipkin-tracing-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"cluster": "test",
"id": "test-proxy",
"metadata": {
"node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449",
"namespace": "default",
"partition": "default"
}
Expand Down