From ca8d4c99feea1f06991b48fc3d1a62ad81599bff Mon Sep 17 00:00:00 2001 From: Andrew Crump Date: Mon, 27 Feb 2023 22:40:57 +0000 Subject: [PATCH] Remove unused metron_endpoint.dropsonde_port property - 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: https://github.com/grpc/grpc-go/pull/5732 (cherry picked from commit 63cf49e44e71cd184c8e481d51aee970f646e5e1) --- jobs/loggregator_trafficcontroller/spec | 3 --- jobs/loggregator_trafficcontroller/templates/bpm.yml.erb | 1 - src/testservers/traffic_controller.go | 2 +- src/trafficcontroller/app/config.go | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/jobs/loggregator_trafficcontroller/spec b/jobs/loggregator_trafficcontroller/spec index 1495c8d33..16c8ad87c 100644 --- a/jobs/loggregator_trafficcontroller/spec +++ b/jobs/loggregator_trafficcontroller/spec @@ -88,9 +88,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 diff --git a/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb b/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb index 0b8db0afd..8b109b798 100644 --- a/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb +++ b/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb @@ -28,7 +28,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(",") %>" diff --git a/src/testservers/traffic_controller.go b/src/testservers/traffic_controller.go index 4feed7510..96fd50803 100644 --- a/src/testservers/traffic_controller.go +++ b/src/testservers/traffic_controller.go @@ -37,7 +37,7 @@ func BuildTrafficControllerConf(routerAddr string, agentPort int, logCacheAddr s 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"), diff --git a/src/trafficcontroller/app/config.go b/src/trafficcontroller/app/config.go index ded9d7275..24cf90b10 100644 --- a/src/trafficcontroller/app/config.go +++ b/src/trafficcontroller/app/config.go @@ -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"` }