Remove dead code

Signed-off-by: Kevin Dorosh <kevin.dorosh@solo.io>
istio · Jul 5, 2023 · 0eb683e · 0eb683e
1 parent 929addf
commit 0eb683e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/pilot/pkg/serviceregistry/kube/controller/ambientindex.go b/pilot/pkg/serviceregistry/kube/controller/ambientindex.go
@@ -435,7 +435,7 @@ func (c *Controller) setupIndex() *AmbientIndex {
 		updates := sets.New[model.ConfigKey]()
 
 		if event != model.EventAdd {
-			c.cleanupOldServiceEntryVips(svc, updates)
+			c.cleanupOldWorkloadEntriesInlinedOnServiceEntry(svc, updates)
 		}
 
 		serviceEntryNamespacedName := types.NamespacedName{
@@ -445,8 +445,9 @@ func (c *Controller) setupIndex() *AmbientIndex {
 
 		// Update indexes
 		if event == model.EventDelete {
-			// servicesMap is used when cleaning up old VIPs (e.g. `ServiceEntry.endpoints`) so we must
-			// delete this after we clean up VIPs
+			// servicesMap is used when cleaning up old WEs inlined on a SE (i.e., `ServiceEntry.endpoints`)
+			// so we must delete this after we clean up the old WEs. That way we don't miss any auto-allocated
+			// VIPs during cleanup on the idx.byWorkloadEntry[networkAddr] map
 			delete(idx.servicesMap, serviceEntryNamespacedName)
 		} else {
 			// servicesMap is used when constructing workloads so it must be up to date

diff --git a/pilot/pkg/serviceregistry/kube/controller/ambientindex_external.go b/pilot/pkg/serviceregistry/kube/controller/ambientindex_external.go
@@ -447,7 +447,7 @@ func (c *Controller) generateServiceEntryUID(svcEntryNamespace, svcEntryName, ad
 	return c.clusterID.String() + "/networking.istio.io/ServiceEntry/" + svcEntryNamespace + "/" + svcEntryName + "/" + addr
 }
 
-func (c *Controller) cleanupOldServiceEntryVips(svc *model.Service, updates sets.Set[model.ConfigKey]) {
+func (c *Controller) cleanupOldWorkloadEntriesInlinedOnServiceEntry(svc *model.Service, updates sets.Set[model.ConfigKey]) {
 	a := c.ambientIndex
 	nsName := types.NamespacedName{
 		Name:      svc.Attributes.ServiceEntryName,
@@ -467,22 +467,6 @@ func (c *Controller) cleanupOldServiceEntryVips(svc *model.Service, updates sets
 				delete(a.byUID, oldUID)
 			}
 		}
-
-		// we also need to remove the VIP from any pod that has it (e.g. from service entry `workloadSelector`)
-		for nwAddr := range a.byPod {
-			wli, ok := a.byPod[nwAddr]
-			if !ok {
-				continue
-			}
-			_, found := wli.Services[namespacedHostname(oldServiceEntry.Attributes.Namespace, oldServiceEntry.Hostname.String())]
-			if found {
-				updates.Insert(model.ConfigKey{Kind: kind.Address, Name: wli.ResourceName()})
-				for _, networkAddr := range networkAddressFromWorkload(wli) {
-					delete(a.byPod, networkAddr)
-				}
-				delete(a.byUID[wli.Uid].Services, namespacedHostname(oldServiceEntry.Attributes.Namespace, oldServiceEntry.Hostname.String()))
-			}
-		}
 	}
 }