From 7a62855d2937c062e81aa4768c0a3f0777995b60 Mon Sep 17 00:00:00 2001 From: Nandan B N Date: Fri, 8 Apr 2022 16:17:55 +0530 Subject: [PATCH] Fix meshPort nil for canary rollout without weights (#200) Signed-off-by: nbn01 Co-authored-by: nbn01 Signed-off-by: sa --- admiral/pkg/clusters/serviceentry.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admiral/pkg/clusters/serviceentry.go b/admiral/pkg/clusters/serviceentry.go index 97bf7b8c..f8d2f9ed 100644 --- a/admiral/pkg/clusters/serviceentry.go +++ b/admiral/pkg/clusters/serviceentry.go @@ -142,6 +142,8 @@ func modifyServiceEntryForNewServiceOrPod(event admiral.EventType, env string, s if len(sourceDeployments) > 0 { meshPorts = GetMeshPorts(sourceCluster, serviceInstance, sourceDeployments[sourceCluster]) + } else { + meshPorts = GetMeshPortsForRollout(sourceCluster, serviceInstance, sourceRollouts[sourceCluster]) } for key, serviceEntry := range serviceEntries { @@ -166,7 +168,6 @@ func modifyServiceEntryForNewServiceOrPod(event admiral.EventType, env string, s // see if we have weighted services (rollouts with canary strategy) } else if len(weightedServices) > 1 { //add one endpoint per each service, may be modify - meshPorts = GetMeshPortsForRollout(sourceCluster, serviceInstance, sourceRollouts[sourceCluster]) var se = copyServiceEntry(serviceEntry) updateEndpointsForWeightedServices(se, weightedServices, clusterIngress, meshPorts) AddServiceEntriesWithDr(remoteRegistry.AdmiralCache, map[string]string{sourceCluster: sourceCluster}, remoteRegistry.RemoteControllers,