Merge pull request #10652 from danwinship/poke-endpoints-filter

Merged by openshift-bot

Author: OpenShift Bot

pkg/sdn/plugin/proxy.go

@@ -3,6 +3,7 @@ package plugin
 import (
 	"fmt"
 	"net"
+	"sync"
 
 	"github.com/golang/glog"
 
@@ -25,10 +26,12 @@ type proxyFirewallItem struct {
 }
 
 type ovsProxyPlugin struct {
-	registry *Registry
-	firewall map[string][]proxyFirewallItem
-
+	registry             *Registry
 	baseEndpointsHandler pconfig.EndpointsConfigHandler
+
+	lock         sync.Mutex
+	firewall     map[string][]proxyFirewallItem
+	allEndpoints []kapi.Endpoints
 }
 
 // Called by higher layers to create the proxy plugin instance; only used by nodes
@@ -77,8 +80,15 @@ func (proxy *ovsProxyPlugin) watchEgressNetworkPolicies() {
 		if eventType == watch.Deleted {
 			policy.Spec.Egress = nil
 		}
-		proxy.updateNetworkPolicy(*policy)
-		// FIXME: poke the endpoint-syncer somehow...
+
+		func() {
+			proxy.lock.Lock()
+			defer proxy.lock.Unlock()
+			proxy.updateNetworkPolicy(*policy)
+			if proxy.allEndpoints != nil {
+				proxy.updateEndpoints()
+			}
+		}()
 	}
 }
 
@@ -111,8 +121,15 @@ func (proxy *ovsProxyPlugin) firewallBlocksIP(namespace string, ip net.IP) bool
 }
 
 func (proxy *ovsProxyPlugin) OnEndpointsUpdate(allEndpoints []kapi.Endpoints) {
+	proxy.lock.Lock()
+	defer proxy.lock.Unlock()
+	proxy.allEndpoints = allEndpoints
+	proxy.updateEndpoints()
+}
+
+func (proxy *ovsProxyPlugin) updateEndpoints() {
 	if len(proxy.firewall) == 0 {
-		proxy.baseEndpointsHandler.OnEndpointsUpdate(allEndpoints)
+		proxy.baseEndpointsHandler.OnEndpointsUpdate(proxy.allEndpoints)
 		return
 	}
 
@@ -122,10 +139,10 @@ func (proxy *ovsProxyPlugin) OnEndpointsUpdate(allEndpoints []kapi.Endpoints) {
 		return
 	}
 
-	filteredEndpoints := make([]kapi.Endpoints, 0, len(allEndpoints))
+	filteredEndpoints := make([]kapi.Endpoints, 0, len(proxy.allEndpoints))
 
 EndpointLoop:
-	for _, ep := range allEndpoints {
+	for _, ep := range proxy.allEndpoints {
 		ns := ep.ObjectMeta.Namespace
 		for _, ss := range ep.Subsets {
 			for _, addr := range ss.Addresses {