From 7013a52ee5fd77cfc52f89f629d3dc10e3749c71 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Tue, 21 Feb 2017 11:04:08 -0300 Subject: [PATCH] Return sorted endpoints --- controllers/nginx/Makefile | 2 +- core/pkg/ingress/controller/controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile index 1f98d5492..8bee35692 100644 --- a/controllers/nginx/Makefile +++ b/controllers/nginx/Makefile @@ -3,7 +3,7 @@ all: push BUILDTAGS= # Use the 0.0 tag for testing, it shouldn't clobber any release builds -RELEASE?=0.9.0-beta.1 +RELEASE?=0.9.0-beta.2 PREFIX?=gcr.io/google_containers/nginx-ingress-controller GOOS?=linux diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go index 09c24a9e8..0523d3063 100644 --- a/core/pkg/ingress/controller/controller.go +++ b/core/pkg/ingress/controller/controller.go @@ -658,7 +658,6 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress glog.V(3).Infof("upstream %v does not have any active endpoints. Using default backend", value.Name) value.Endpoints = append(value.Endpoints, newDefaultServer()) } - sort.Sort(ingress.EndpointByAddrPort(value.Endpoints)) aUpstreams = append(aUpstreams, value) } sort.Sort(ingress.BackendByNameServers(aUpstreams)) @@ -794,6 +793,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string, glog.Warningf("service %v does not have any active endpoints", svcKey) } + sort.Sort(ingress.EndpointByAddrPort(endps)) upstreams = append(upstreams, endps...) break }