Merge pull request #850 from noironetworks/revert

Revert "Add locks to secure SNAT go routines in hostagent"

pkg/hostagent/pod_relatives.go

@@ -78,8 +78,6 @@ func (agent *HostAgent) updatePodsForNamespace(ns string) {
 func (agent *HostAgent) namespaceAdded(obj interface{}) {
 	ns := obj.(*v1.Namespace)
 	agent.log.Infof("Namespace %+v added", ns)
-	agent.indexMutex.Lock()
-	defer agent.indexMutex.Unlock()
 	agent.netPolPods.UpdateNamespace(ns)
 	agent.updatePodsForNamespace(ns.ObjectMeta.Name)
 	agent.handleObjectUpdateForSnat(obj)
@@ -94,9 +92,7 @@ func (agent *HostAgent) namespaceChanged(oldobj interface{},
 
 	if !reflect.DeepEqual(oldns.ObjectMeta.Labels, newns.ObjectMeta.Labels) {
 		agent.netPolPods.UpdateNamespace(newns)
-		agent.indexMutex.Lock()
 		agent.handleObjectUpdateForSnat(newobj)
-		agent.indexMutex.Unlock()
 	}
 	if !reflect.DeepEqual(oldns.ObjectMeta.Annotations,
 		newns.ObjectMeta.Annotations) {
@@ -327,8 +323,6 @@ func deploymentLogger(log *logrus.Logger, dep *appsv1.Deployment) *logrus.Entry
 
 func (agent *HostAgent) deploymentAdded(obj interface{}) {
 	agent.log.Infof("deploymentAdded => ")
-	agent.indexMutex.Lock()
-	defer agent.indexMutex.Unlock()
 	agent.depPods.UpdateSelectorObj(obj)
 	agent.handleObjectUpdateForSnat(obj)
 }
@@ -359,9 +353,7 @@ func (agent *HostAgent) deploymentChanged(oldobj interface{},
 	}
 	if !reflect.DeepEqual(olddep.ObjectMeta.Labels,
 		newdep.ObjectMeta.Labels) {
-		agent.indexMutex.Lock()
 		agent.handleObjectUpdateForSnat(newdep)
-		agent.indexMutex.Unlock()
 	}
 }