Handle dependency update event

admiral/pkg/clusters/serviceentry.go

@@ -175,27 +175,25 @@ func createServiceEntryForNewServiceOrPod(env string, sourceIdentity string, rem
 					ep.Ports = oldPorts
 				}
 			}
+		}
 
-			for _, val := range dependents.Map() {
-				remoteRegistry.AdmiralCache.DependencyNamespaceCache.Put(val, serviceInstance.Namespace, localFqdn)
-			}
+		for _, val := range dependents.Map() {
+			remoteRegistry.AdmiralCache.DependencyNamespaceCache.Put(val, serviceInstance.Namespace, localFqdn)
+		}
 
-			if common.GetWorkloadSidecarUpdate() == "enabled" {
-				for _, sidecarEgress := range remoteRegistry.AdmiralCache.DependencyNamespaceCache.Get(sourceIdentity) {
-					modifySidecarForLocalClusterCommunication(serviceInstance.Namespace, sidecarEgress.Namespace, sidecarEgress.FQDN, rc)
-				}
-			}
+		if common.GetWorkloadSidecarUpdate() == "enabled" {
+			modifySidecarForLocalClusterCommunication(serviceInstance.Namespace, remoteRegistry.AdmiralCache.DependencyNamespaceCache.Get(sourceIdentity), rc)
 		}
 	}
 	return serviceEntries
 }
 
-func modifySidecarForLocalClusterCommunication(sidecarNamespace string, dependencyNamespace string, localFqdn string, rc *RemoteController) {
+func modifySidecarForLocalClusterCommunication(sidecarNamespace string, sidecarEgressMap map[string]common.SidecarEgress, rc *RemoteController) {
 
 	//get existing sidecar from the cluster
 	sidecarConfig := rc.SidecarController
 
-	if sidecarConfig == nil {
+	if sidecarConfig == nil || sidecarEgressMap == nil {
 		return
 	}
 
@@ -208,10 +206,11 @@ func modifySidecarForLocalClusterCommunication(sidecarNamespace string, dependen
 	//copy and add our new local FQDN
 	newSidecar := copySidecar(sidecar)
 
-	egressHost := dependencyNamespace + "/" + localFqdn
-
-	if !util.Contains(newSidecar.Spec.Egress[0].Hosts, egressHost) {
-		newSidecar.Spec.Egress[0].Hosts = append(newSidecar.Spec.Egress[0].Hosts, egressHost)
+	for _, sidecarEgress := range sidecarEgressMap {
+		egressHost := sidecarEgress.Namespace + "/" + sidecarEgress.FQDN
+		if !util.Contains(newSidecar.Spec.Egress[0].Hosts, egressHost) {
+			newSidecar.Spec.Egress[0].Hosts = append(newSidecar.Spec.Egress[0].Hosts, egressHost)
+		}
 	}
 
 	newSidecarConfig := createSidecarSkeletion(newSidecar.Spec, common.GetWorkloadSidecarName(), sidecarNamespace)

admiral/pkg/clusters/serviceentry_test.go

@@ -295,7 +295,10 @@ func TestModifyNonExistingSidecarForLocalClusterCommunication(t *testing.T) {
 	remoteController := &RemoteController{}
 	remoteController.SidecarController = sidecarController
 
-	modifySidecarForLocalClusterCommunication("test-sidecar-namespace", "test-dependency-namespace", "test-local-fqdn", remoteController)
+	sidecarEgressMap := make(map[string]common.SidecarEgress)
+	sidecarEgressMap["test-dependency-namespace"] = common.SidecarEgress{Namespace: "test-dependency-namespace", FQDN: "test-local-fqdn"}
+
+	modifySidecarForLocalClusterCommunication("test-sidecar-namespace", sidecarEgressMap, remoteController)
 
 	sidecarObj, _ := sidecarController.IstioClient.NetworkingV1alpha3().Sidecars("test-sidecar-namespace").Get(common.GetWorkloadSidecarName(), v12.GetOptions{})
 
@@ -328,7 +331,9 @@ func TestModifyExistingSidecarForLocalClusterCommunication(t *testing.T) {
 
 	if createdSidecar != nil {
 
-		modifySidecarForLocalClusterCommunication("test-sidecar-namespace", "test-dependency-namespace", "test-local-fqdn", remoteController)
+		sidecarEgressMap := make(map[string]common.SidecarEgress)
+		sidecarEgressMap["test-dependency-namespace"] = common.SidecarEgress{Namespace: "test-dependency-namespace", FQDN: "test-local-fqdn"}
+		modifySidecarForLocalClusterCommunication("test-sidecar-namespace", sidecarEgressMap, remoteController)
 
 		updatedSidecar, error := sidecarController.IstioClient.NetworkingV1alpha3().Sidecars("test-sidecar-namespace").Get("default", v12.GetOptions{})
 

admiral/pkg/clusters/types.go

@@ -174,18 +174,30 @@ type ServiceHandler struct {
 
 func (dh *DependencyHandler) Added(obj *v1.Dependency) {
 
-	log.Infof(LogFormat, "Event", "dependency-record", obj.Name, "", "Received=true namespace="+obj.Namespace)
+	log.Infof(LogFormat, "Add", "dependency-record", obj.Name, "", "Received=true namespace="+obj.Namespace)
 
+	HandleDependencyRecord(obj, dh.RemoteRegistry)
+
+}
+
+func (dh *DependencyHandler) Updated(obj *v1.Dependency) {
+
+	log.Infof(LogFormat, "Update", "dependency-record", obj.Name, "", "Received=true namespace="+obj.Namespace)
+
+	HandleDependencyRecord(obj, dh.RemoteRegistry)
+
+}
+
+func HandleDependencyRecord(obj *v1.Dependency, remoteRegitry *RemoteRegistry)  {
 	sourceIdentity := obj.Spec.Source
 
 	if len(sourceIdentity) == 0 {
 		log.Infof(LogFormat, "Event", "dependency-record", obj.Name, "", "No identity found namespace="+obj.Namespace)
 	}
 
-	updateIdentityDependencyCache(sourceIdentity, dh.RemoteRegistry.AdmiralCache.IdentityDependencyCache, obj)
-
-	handleDependencyRecord(sourceIdentity, dh.RemoteRegistry, dh.RemoteRegistry.remoteControllers, obj)
+	updateIdentityDependencyCache(sourceIdentity, remoteRegitry.AdmiralCache.IdentityDependencyCache, obj)
 
+	handleDependencyRecord(sourceIdentity, remoteRegitry, remoteRegitry.remoteControllers, obj)
 }
 
 func (dh *DependencyHandler) Deleted(obj *v1.Dependency) {

admiral/pkg/controller/admiral/dependency.go

@@ -16,6 +16,7 @@ import (
 // Handler interface contains the methods that are required
 type DepHandler interface {
 	Added(obj *v1.Dependency)
+	Updated(obj *v1.Dependency)
 	Deleted(obj *v1.Dependency)
 }
 
@@ -107,6 +108,12 @@ func (d *DependencyController) Added(ojb interface{}) {
 	d.DepHandler.Added(dep)
 }
 
+func (d *DependencyController) Updated(ojb interface{}) {
+	dep := ojb.(*v1.Dependency)
+	d.Cache.Put(dep)
+	d.DepHandler.Added(dep)
+}
+
 func (d *DependencyController) Deleted(ojb interface{}) {
 	dep := ojb.(*v1.Dependency)
 	d.DepHandler.Deleted(dep)

admiral/pkg/controller/common/types.go

@@ -22,7 +22,7 @@ type SidecarEgress struct {
 }
 
 type SidecarEgressMap struct {
-	cache map[string][]SidecarEgress
+	cache map[string]map[string]SidecarEgress
 	mutex *sync.Mutex
 }
 
@@ -64,7 +64,7 @@ type LabelSet struct {
 
 func NewSidecarEgressMap() *SidecarEgressMap {
 	n := new(SidecarEgressMap)
-	n.cache = make(map[string][]SidecarEgress)
+	n.cache = make(map[string]map[string]SidecarEgress)
 	n.mutex = &sync.Mutex{}
 	return n
 }
@@ -113,8 +113,8 @@ func (s *MapOfMaps) Put(pkey string, key string, value string) {
 	var mapVal = s.cache[pkey]
 	if mapVal == nil {
 		mapVal = NewMap()
-		mapVal.Put(key, value)
 	}
+	mapVal.Put(key, value)
 	s.cache[pkey] = mapVal
 }
 
@@ -137,13 +137,13 @@ func (s *SidecarEgressMap) Put(asset string, namespace string, fqdn string) {
 	s.mutex.Lock()
 	var mapVal = s.cache[asset]
 	if mapVal == nil {
-		mapVal = make([]SidecarEgress, 0)
+		mapVal = make(map[string]SidecarEgress, 0)
 	}
-	mapVal = append(mapVal, SidecarEgress{Namespace: namespace, FQDN: fqdn})
+	mapVal[namespace] = SidecarEgress{Namespace: namespace, FQDN: fqdn}
 	s.cache[asset] = mapVal
 }
 
-func (s *SidecarEgressMap) Get(key string) []SidecarEgress {
+func (s *SidecarEgressMap) Get(key string) map[string]SidecarEgress {
 	return s.cache[key]
 }
 
@@ -153,6 +153,6 @@ func (s *SidecarEgressMap) Delete(key string) {
 	delete(s.cache, key)
 }
 
-func (s *SidecarEgressMap) Map() map[string][]SidecarEgress {
+func (s *SidecarEgressMap) Map() map[string]map[string]SidecarEgress {
 	return s.cache
 }

admiral/pkg/test/mock.go

@@ -75,6 +75,10 @@ func (m *MockDependencyHandler) Added(obj *v1.Dependency) {
 
 }
 
+func (m *MockDependencyHandler) Updated(obj *v1.Dependency) {
+
+}
+
 func (m *MockDependencyHandler) Deleted(obj *v1.Dependency) {
 
 }