DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3367 from aledbf/503-restart

Browse source 
Remove reloads when there is no endpoints
This commit is contained in:
k8s-ci-robot 2018-11-06 06:39:04 -08:00 committed by GitHub
commit 08d5ffabbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/ingress/controller/controller.go
View file

@ -423,15 +423,14 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
aUpstreams := make([]*ingress.Backend, 0, len(upstreams)) aUpstreams := make([]*ingress.Backend, 0, len(upstreams))
for _, upstream := range upstreams { for _, upstream := range upstreams {
aUpstreams = append(aUpstreams, upstream)
isHTTPSfrom := []*ingress.Server{} isHTTPSfrom := []*ingress.Server{}
for _, server := range servers { for _, server := range servers {
for _, location := range server.Locations { for _, location := range server.Locations {
if upstream.Name == location.Backend { if upstream.Name == location.Backend {
if len(upstream.Endpoints) == 0 { if len(upstream.Endpoints) == 0 {
glog.V(3).Infof("Upstream %q has no active Endpoint", upstream.Name) glog.V(3).Infof("Upstream %q has no active Endpoint", upstream.Name)
location.Backend = "" // for nginx.tmpl checking
// check if the location contains endpoints and a custom default backend // check if the location contains endpoints and a custom default backend
if location.DefaultBackend != nil { if location.DefaultBackend != nil {
sp := location.DefaultBackend.Spec.Ports[0] sp := location.DefaultBackend.Spec.Ports[0]
@ -468,14 +467,6 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
} }
} }
// create the list of upstreams and skip those without Endpoints
for _, upstream := range upstreams {
if len(upstream.Endpoints) == 0 {
continue
}
aUpstreams = append(aUpstreams, upstream)
}
aServers := make([]*ingress.Server, 0, len(servers)) aServers := make([]*ingress.Server, 0, len(servers))
for _, value := range servers { for _, value := range servers {
sort.SliceStable(value.Locations, func(i, j int) bool { sort.SliceStable(value.Locations, func(i, j int) bool {
@ -552,6 +543,11 @@ func (n *NGINXController) createUpstreams(data []*extensions.Ingress, du *ingres
} }
} }
s, err := n.store.GetService(svcKey)
if err != nil {
glog.Warningf("Error obtaining Service %q: %v", svcKey, err)
}
upstreams[defBackend].Service = s
} }
for _, rule := range ing.Spec.Rules { for _, rule := range ing.Spec.Rules {

5
rootfs/etc/nginx/lua/balancer.lua
View file

@ -68,6 +68,11 @@ local function format_ipv6_endpoints(endpoints)
end end
local function sync_backend(backend) local function sync_backend(backend)
if not backend.endpoints or #backend.endpoints == 0 then
ngx.log(ngx.INFO, string.format("there is no endpoint for backend %s. Skipping...", backend.name))
return
end
local implementation = get_implementation(backend) local implementation = get_implementation(backend)
local balancer = balancers[backend.name] local balancer = balancers[backend.name]