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

Continue to ingore non-gce ingress in lister.

Browse source
This commit is contained in:
bprashanth 2016-08-08 10:27:36 -07:00
parent b28e1607c6
commit 1a890fe7db
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
controllers/gce/controller/controller.go
View file

@ -291,7 +291,10 @@ func (lbc *LoadBalancerController) sync(key string) (err error) {
} }
nodePorts := lbc.tr.toNodePorts(&paths) nodePorts := lbc.tr.toNodePorts(&paths)
lbNames := lbc.ingLister.Store.ListKeys() lbNames := lbc.ingLister.Store.ListKeys()
lbs, _ := lbc.ListRuntimeInfo() lbs, err := lbc.ListRuntimeInfo()
if err != nil {
return err
}
nodeNames, err := lbc.getReadyNodeNames() nodeNames, err := lbc.getReadyNodeNames()
if err != nil { if err != nil {
return err return err
@ -404,14 +407,17 @@ func (lbc *LoadBalancerController) updateIngressStatus(l7 *loadbalancers.L7, ing
// ListRuntimeInfo lists L7RuntimeInfo as understood by the loadbalancer module. // ListRuntimeInfo lists L7RuntimeInfo as understood by the loadbalancer module.
func (lbc *LoadBalancerController) ListRuntimeInfo() (lbs []*loadbalancers.L7RuntimeInfo, err error) { func (lbc *LoadBalancerController) ListRuntimeInfo() (lbs []*loadbalancers.L7RuntimeInfo, err error) {
for _, m := range lbc.ingLister.Store.List() { ingList, err := lbc.ingLister.List()
ing := m.(*extensions.Ingress) if err != nil {
k, err := keyFunc(ing) return lbs, err
}
for _, ing := range ingList.Items {
k, err := keyFunc(&ing)
if err != nil { if err != nil {
glog.Warningf("Cannot get key for Ingress %v/%v: %v", ing.Namespace, ing.Name, err) glog.Warningf("Cannot get key for Ingress %v/%v: %v", ing.Namespace, ing.Name, err)
continue continue
} }
tls, err := lbc.tlsLoader.load(ing) tls, err := lbc.tlsLoader.load(&ing)
if err != nil { if err != nil {
glog.Warningf("Cannot get certs for Ingress %v/%v: %v", ing.Namespace, ing.Name, err) glog.Warningf("Cannot get certs for Ingress %v/%v: %v", ing.Namespace, ing.Name, err)
} }

5
controllers/gce/controller/utils.go
View file

@ -188,7 +188,10 @@ type StoreToIngressLister struct {
// List lists all Ingress' in the store. // List lists all Ingress' in the store.
func (s *StoreToIngressLister) List() (ing extensions.IngressList, err error) { func (s *StoreToIngressLister) List() (ing extensions.IngressList, err error) {
for _, m := range s.Store.List() { for _, m := range s.Store.List() {
ing.Items = append(ing.Items, *(m.(*extensions.Ingress))) newIng := m.(*extensions.Ingress)
if isGCEIngress(newIng) {
ing.Items = append(ing.Items, *newIng)
}
} }
return ing, nil return ing, nil
} }