Add check for nodecontroller and locality being nil (#250)

istio-ecosystem · Jul 28, 2022 · 54cca3f · 54cca3f
1 parent 1bffeaf
commit 54cca3f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admiral/pkg/clusters/serviceentry.go b/admiral/pkg/clusters/serviceentry.go
@@ -432,8 +432,8 @@ func AddServiceEntriesWithDr(cache *AdmiralCache, sourceClusters map[string]stri
 
 			rc := rcs[sourceCluster]
 
-			if rc == nil {
-				log.Warnf(LogFormat, "Find", "remote-controller", sourceCluster, sourceCluster, "doesn't exist")
+			if rc == nil || rc.NodeController == nil || rc.NodeController.Locality == nil {
+				log.Warnf(LogFormat, "Find", "remote-controller", sourceCluster, sourceCluster, "locality not available for the cluster")
 				continue
 			}