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

Merge pull request #14517 from jayunit100/reorder

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-18 09:04:23 -07:00
commit ff7ce44e74
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/master/controller.go
View File

@ -248,18 +248,22 @@ func (c *Controller) SetEndpoints(serviceName string, ip net.IP, endpointPorts [
glog.Warningf("Resetting endpoints for master service %q to %v", serviceName, e) glog.Warningf("Resetting endpoints for master service %q to %v", serviceName, e)
return c.EndpointRegistry.UpdateEndpoints(ctx, e) return c.EndpointRegistry.UpdateEndpoints(ctx, e)
} else if !ipCorrect { } else if !ipCorrect {
// We *always* add our own IP address; if there are too many IP // We *always* add our own IP address.
// addresses, we remove the ones lexicographically after our e.Subsets[0].Addresses = append(e.Subsets[0].Addresses, api.EndpointAddress{IP: ip.String()})
// Lexicographic order is retained by this step.
e.Subsets = endpoints.RepackSubsets(e.Subsets)
// If too many IP addresses, remove the ones lexicographically after our
// own IP address. Given the requirements stated at the top of // own IP address. Given the requirements stated at the top of
// this function, this should cause the list of IP addresses to // this function, this should cause the list of IP addresses to
// become eventually correct. // become eventually correct.
e.Subsets[0].Addresses = append(e.Subsets[0].Addresses, api.EndpointAddress{IP: ip.String()})
e.Subsets = endpoints.RepackSubsets(e.Subsets)
if addrs := &e.Subsets[0].Addresses; len(*addrs) > c.MasterCount { if addrs := &e.Subsets[0].Addresses; len(*addrs) > c.MasterCount {
// addrs is a pointer because we're going to mutate it. // addrs is a pointer because we're going to mutate it.
for i, addr := range *addrs { for i, addr := range *addrs {
if addr.IP == ip.String() { if addr.IP == ip.String() {
for len(*addrs) > c.MasterCount { for len(*addrs) > c.MasterCount {
// wrap around if necessary.
remove := (i + 1) % len(*addrs) remove := (i + 1) % len(*addrs)
*addrs = append((*addrs)[:remove], (*addrs)[remove+1:]...) *addrs = append((*addrs)[:remove], (*addrs)[remove+1:]...)
} }