Sanitize newEndpoints semantics, remove a dup arg

pkg/proxy/iptables/proxier.go

@@ -588,7 +588,6 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
 	defer proxier.mu.Unlock()
 	proxier.haveReceivedEndpointsUpdate = true
 
-	activeEndpoints := make(map[proxy.ServicePortName]bool) // use a map as a set
 	staleConnections := make(map[endpointServicePair]bool)
 	svcPortToInfoMap := make(map[proxy.ServicePortName][]hostPortInfo)
 	newEndpointsMap := make(map[proxy.ServicePortName][]*endpointsInfo)
@@ -596,14 +595,14 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
 	// Update endpoints for services.
 	for i := range allEndpoints {
 		accumulateEndpointsMap(&allEndpoints[i], proxier.hostname, proxier.endpointsMap, &newEndpointsMap,
-			&svcPortToInfoMap, &staleConnections, &activeEndpoints)
+			&svcPortToInfoMap, &staleConnections)
 	}
 	// Check stale connections against endpoints missing from the update.
 	// TODO: we should really only mark a connection stale if the proto was UDP
 	// and the (ip, port, proto) was removed from the endpoints.
 	for svcPort := range proxier.endpointsMap {
-		if !activeEndpoints[svcPort] {
-			glog.V(2).Infof("Removing endpoints for %q", svcPort)
+		if _, found := newEndpointsMap[svcPort]; !found {
+			glog.V(3).Infof("Removing endpoints for %q", svcPort)
 			// record endpoints of unactive service to stale connections
 			for _, ep := range proxier.endpointsMap[svcPort] {
 				staleConnections[endpointServicePair{endpoint: ep.endpoint, servicePortName: svcPort}] = true
@@ -640,8 +639,7 @@ func accumulateEndpointsMap(endpoints *api.Endpoints, hostname string,
 	curEndpoints map[proxy.ServicePortName][]*endpointsInfo,
 	newEndpoints *map[proxy.ServicePortName][]*endpointsInfo,
 	svcPortToInfoMap *map[proxy.ServicePortName][]hostPortInfo,
-	staleConnections *map[endpointServicePair]bool,
-	activeEndpoints *map[proxy.ServicePortName]bool) {
+	staleConnections *map[endpointServicePair]bool) {
 
 	// We need to build a map of portname -> all ip:ports for that
 	// portname.  Explode Endpoints.Subsets[*] into this structure.
@@ -678,9 +676,9 @@ func accumulateEndpointsMap(endpoints *api.Endpoints, hostname string,
 				(*staleConnections)[endpointServicePair{endpoint: ep, servicePortName: svcPort}] = true
 			}
 		}
+		glog.V(3).Infof("Setting endpoints for %q to %+v", svcPort, newEPList)
 		// Once the set operations using the list of ips are complete, build the list of endpoint infos
 		(*newEndpoints)[svcPort] = buildEndpointInfoList(portsToEndpoints[portname], newEPList)
-		(*activeEndpoints)[svcPort] = true
 	}
 }