github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge() and Unmerge() needlessly exported

Browse Source
This commit is contained in:
Jacob Tanenbaum 2019-04-04 14:41:15 -04:00
parent 95eb3a6702
commit 1d60557c87
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/proxy/endpoints.go
View File

@ -290,8 +290,8 @@ func (em EndpointsMap) apply(changes *EndpointChangeTracker, staleEndpoints *[]S
changes.lock.Lock() changes.lock.Lock()
defer changes.lock.Unlock() defer changes.lock.Unlock()
for _, change := range changes.items { for _, change := range changes.items {
em.Unmerge(change.previous) em.unmerge(change.previous)
em.Merge(change.current) em.merge(change.current)
detectStaleConnections(change.previous, change.current, staleEndpoints, staleServiceNames) detectStaleConnections(change.previous, change.current, staleEndpoints, staleServiceNames)
} }
changes.items = make(map[types.NamespacedName]*endpointsChange) changes.items = make(map[types.NamespacedName]*endpointsChange)
@ -302,14 +302,14 @@ func (em EndpointsMap) apply(changes *EndpointChangeTracker, staleEndpoints *[]S
} }
// Merge ensures that the current EndpointsMap contains all <service, endpoints> pairs from the EndpointsMap passed in. // Merge ensures that the current EndpointsMap contains all <service, endpoints> pairs from the EndpointsMap passed in.
func (em EndpointsMap) Merge(other EndpointsMap) { func (em EndpointsMap) merge(other EndpointsMap) {
for svcPortName := range other { for svcPortName := range other {
em[svcPortName] = other[svcPortName] em[svcPortName] = other[svcPortName]
} }
} }
// Unmerge removes the <service, endpoints> pairs from the current EndpointsMap which are contained in the EndpointsMap passed in. // Unmerge removes the <service, endpoints> pairs from the current EndpointsMap which are contained in the EndpointsMap passed in.
func (em EndpointsMap) Unmerge(other EndpointsMap) { func (em EndpointsMap) unmerge(other EndpointsMap) {
for svcPortName := range other { for svcPortName := range other {
delete(em, svcPortName) delete(em, svcPortName)
} }