From 48e3ea7b44775d4b93ee31e7b7ae8e9ac74b9517 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Mon, 27 Jul 2020 15:46:56 -0700 Subject: [PATCH] adding lines missed on previous rebase --- cns/restserver/internalapi.go | 2 +- cns/service/main.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cns/restserver/internalapi.go b/cns/restserver/internalapi.go index 68b6e1c109..a37a980def 100644 --- a/cns/restserver/internalapi.go +++ b/cns/restserver/internalapi.go @@ -80,7 +80,7 @@ func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string, } for _, nc := range nodeInfoResponse.NetworkContainers { - ncid := cns.SwiftPrefix + nc.NetworkContainerid + ncid := nc.NetworkContainerid delete(ncsToBeDeleted, ncid) if savedNc, exists := service.state.ContainerStatus[ncid]; !exists || savedNc.CreateNetworkContainerRequest.Version < nc.Version { ncsToBeAdded[ncid] = nc diff --git a/cns/service/main.go b/cns/service/main.go index 4caaec20ae..272fd73c29 100644 --- a/cns/service/main.go +++ b/cns/service/main.go @@ -320,6 +320,7 @@ func main() { logger.Printf("[Azure CNS] Read config :%+v", cnsconfig) if cnsconfig.ChannelMode == cns.Managed { + config.ChannelMode = cns.Managed privateEndpoint = cnsconfig.ManagedSettings.PrivateEndpoint infravnet = cnsconfig.ManagedSettings.InfrastructureNetworkID nodeID = cnsconfig.ManagedSettings.NodeID