Skip to content

Commit

Permalink
Remove unused metron_endpoint.dropsonde_port property
Browse files Browse the repository at this point in the history
- Remove unused BOSH property and associated config field from traffic
  controller
- Pass GRPCAddress rather than UDPAddress when creating a test server.
  gRPC-Go v1.52.0+ will error if the provided endpoint is empty:
  grpc/grpc-go#5732
  • Loading branch information
acrmp committed Feb 28, 2023
1 parent 3c1cd41 commit 63cf49e
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 6 deletions.
3 changes: 0 additions & 3 deletions jobs/loggregator_trafficcontroller/spec
Expand Up @@ -76,9 +76,6 @@ properties:
metron_endpoint.host:
description: "The host used to emit messages to the Metron agent"
default: "127.0.0.1"
metron_endpoint.dropsonde_port:
description: "The port used to emit dropsonde messages to the Metron agent"
default: 3457
metron_endpoint.grpc_port:
description: "The port used to emit grpc messages to the Metron agent"
default: 3458
Expand Down
1 change: 0 additions & 1 deletion jobs/loggregator_trafficcontroller/templates/bpm.yml.erb
Expand Up @@ -21,7 +21,6 @@ processes:
- name: loggregator_trafficcontroller
executable: /var/vcap/packages/loggregator_trafficcontroller/trafficcontroller
env:
AGENT_UDP_ADDRESS: "<%= p('metron_endpoint.host').to_s + ":" + p('metron_endpoint.dropsonde_port').to_s %>"
AGENT_GRPC_ADDRESS: "<%= p('metron_endpoint.host').to_s + ":" + p('metron_endpoint.grpc_port').to_s %>"

ROUTER_ADDRS: "<%= router_addrs.join(",") %>"
Expand Down
2 changes: 1 addition & 1 deletion src/testservers/traffic_controller.go
Expand Up @@ -36,7 +36,7 @@ func BuildTrafficControllerConf(routerAddr string, agentPort int) tcConf.Config
ServerName: "cloud-controller",
},
Agent: tcConf.Agent{
UDPAddress: fmt.Sprintf("localhost:%d", agentPort),
GRPCAddress: fmt.Sprintf("localhost:%d", agentPort),
},
GRPC: tcConf.GRPC{
CertFile: LoggregatorTestCerts.Cert("trafficcontroller"),
Expand Down
1 change: 0 additions & 1 deletion src/trafficcontroller/app/config.go
Expand Up @@ -10,7 +10,6 @@ import (

// Agent stores configuration for communication to a logging/metric agent.
type Agent struct {
UDPAddress string `env:"AGENT_UDP_ADDRESS"`
GRPCAddress string `env:"AGENT_GRPC_ADDRESS"`
}

Expand Down

0 comments on commit 63cf49e

Please sign in to comment.