From a67c92b9610f61ab092cff66f99f8d5673f7c33d Mon Sep 17 00:00:00 2001 From: freddygv Date: Mon, 15 Mar 2021 16:08:03 -0600 Subject: [PATCH] Update service manager to pass MeshGateway with config req --- agent/service_manager.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/agent/service_manager.go b/agent/service_manager.go index 8f3f31625..2f4e88ba9 100644 --- a/agent/service_manager.go +++ b/agent/service_manager.go @@ -312,8 +312,6 @@ func makeConfigRequest(bd BaseDeps, addReq AddServiceRequest) *structs.ServiceCo var ( ns = addReq.Service name = ns.Service - id = ns.ID - node = addReq.nodeName ) var upstreams []structs.ServiceID @@ -338,10 +336,9 @@ func makeConfigRequest(bd BaseDeps, addReq AddServiceRequest) *structs.ServiceCo req := &structs.ServiceConfigRequest{ Name: name, - ID: id, - NodeName: node, Datacenter: bd.RuntimeConfig.Datacenter, QueryOptions: structs.QueryOptions{Token: addReq.token}, + MeshGateway: ns.Proxy.MeshGateway, UpstreamIDs: upstreams, EnterpriseMeta: ns.EnterpriseMeta, }