From ca1a4dfef455e24b23327048bd106ee053ed1dad Mon Sep 17 00:00:00 2001 From: aattuluri Date: Tue, 3 May 2022 23:03:31 -0700 Subject: [PATCH 1/2] Fix gtp match --- admiral/pkg/clusters/serviceentry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admiral/pkg/clusters/serviceentry.go b/admiral/pkg/clusters/serviceentry.go index 04ad0ff6..54661512 100644 --- a/admiral/pkg/clusters/serviceentry.go +++ b/admiral/pkg/clusters/serviceentry.go @@ -435,7 +435,7 @@ func AddServiceEntriesWithDr(cache *AdmiralCache, sourceClusters map[string]stri splitByEnv := strings.Split(se.Hosts[0], common.Sep) var env = splitByEnv[0] - globalTrafficPolicy := cache.GlobalTrafficCache.GetFromIdentity(identityId, env) + globalTrafficPolicy := cache.GlobalTrafficCache.GetFromIdentity(env, identityId) for _, sourceCluster := range sourceClusters { From 321ff5d5d6f47ad8c523465ccc998b82b4365d26 Mon Sep 17 00:00:00 2001 From: aattuluri Date: Tue, 3 May 2022 23:06:25 -0700 Subject: [PATCH 2/2] Fix gtp key construction --- admiral/pkg/clusters/serviceentry.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admiral/pkg/clusters/serviceentry.go b/admiral/pkg/clusters/serviceentry.go index 54661512..2a07cad3 100644 --- a/admiral/pkg/clusters/serviceentry.go +++ b/admiral/pkg/clusters/serviceentry.go @@ -75,7 +75,7 @@ func modifyServiceEntryForNewServiceOrPod(event admiral.EventType, env string, s var namespace string - var gtpKey = common.ConstructGtpKey(sourceIdentity, env) + var gtpKey = common.ConstructGtpKey(env, sourceIdentity) start := time.Now() for _, rc := range remoteRegistry.RemoteControllers { @@ -435,7 +435,7 @@ func AddServiceEntriesWithDr(cache *AdmiralCache, sourceClusters map[string]stri splitByEnv := strings.Split(se.Hosts[0], common.Sep) var env = splitByEnv[0] - globalTrafficPolicy := cache.GlobalTrafficCache.GetFromIdentity(env, identityId) + globalTrafficPolicy := cache.GlobalTrafficCache.GetFromIdentity(identityId, env) for _, sourceCluster := range sourceClusters {