github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41357 from freehan/kube-proxy-skip

Browse Source 
Automatic merge from submit-queue

fix healthcheck update problem introduced by #41223

ref: https://github.com/kubernetes/kubernetes/pull/41223

surgical fix for https://github.com/kubernetes/kubernetes/pull/41223#issuecomment-279120970
This commit is contained in:
Kubernetes Submit Queue
2017-02-13 20:24:56 -08:00
committed by GitHub
parent dc1302c5ef 572e3bebcc
commit b1e0d0ee5e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/proxy/iptables/proxier.go
View File

@@ -649,7 +649,17 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
staleConnections[endpointServicePair{endpoint: ep.ip, servicePortName: svcPort}] = true staleConnections[endpointServicePair{endpoint: ep.ip, servicePortName: svcPort}] = true
} }
} }
}
// Update service health check
allSvcPorts := make(map[proxy.ServicePortName]bool)
for svcPort := range proxier.endpointsMap {
allSvcPorts[svcPort] = true
}
for svcPort := range newEndpointsMap {
allSvcPorts[svcPort] = true
}
for svcPort := range allSvcPorts {
proxier.updateHealthCheckEntries(svcPort.NamespacedName, svcPortToInfoMap[svcPort]) proxier.updateHealthCheckEntries(svcPort.NamespacedName, svcPortToInfoMap[svcPort])
} }