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

Use struct to pack Ingress and its annotations

Browse source
This commit is contained in:
Maxime Ginters 2018-11-19 16:52:10 -05:00
parent bf7ad0daca
commit 12766cdfc6
8 changed files with 171 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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"
@ -796,9 +795,9 @@ type ingressInformation struct {
}
func getIngressInformation(i, p interface{}) *ingressInformation {
ing, ok := i.(*extensions.Ingress)
ing, ok := i.(*ingress.Ingress)
if !ok {
glog.Errorf("expected an '*extensions.Ingress' type but %T was returned", i)
glog.Errorf("expected an '*ingress.Ingress' type but %T was returned", i)
return &ingressInformation{}
}