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

Fix service when redirect annotation is used

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-02-26 14:03:08 -03:00
parent 3c67976969
commit 0db57c22bc
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/file/bindata.go
View file

File diff suppressed because one or more lines are too long

15
internal/ingress/controller/template/template.go
View file

@ -34,7 +34,6 @@ import (
"github.com/golang/glog"
"github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress"
@ -628,22 +627,18 @@ type ingressInformation struct {
Annotations map[string]string
}
func getIngressInformation(i, p interface{}) *ingressInformation {
ing, ok := i.(*extensions.Ingress)
func getIngressInformation(i interface{}) *ingressInformation {
location, ok := i.(*ingress.Location)
if !ok {
glog.Errorf("expected an '*extensions.Ingress' type but %T was returned", i)
return &ingressInformation{}
}
path, ok := p.(string)
if !ok {
glog.Errorf("expected a 'string' type but %T was returned", p)
if location == nil {
return &ingressInformation{}
}
if ing == nil {
return &ingressInformation{}
}
ing := location.Ingress
info := &ingressInformation{
Namespace: ing.GetNamespace(),
@ -661,7 +656,7 @@ func getIngressInformation(i, p interface{}) *ingressInformation {
}
for _, rPath := range rule.HTTP.Paths {
if path == rPath.Path {
if location.Path == rPath.Path {
info.Service = rPath.Backend.ServiceName
return info
}

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -711,7 +711,7 @@ stream {
set $proxy_upstream_name "{{ buildUpstreamName $server.Hostname $all.Backends $location }}";
{{ $ing := (getIngressInformation $location.Ingress $path) }}
{{ $ing := (getIngressInformation $location.Ingress) }}
{{/* $ing.Metadata contains the Ingress metadata */}}
set $namespace "{{ $ing.Namespace }}";
set $ingress_name "{{ $ing.Rule }}";