fix bug : ingress-class not work . issue: flag --ingress-class not work #269

hepanchen · hepanchen · commit 6c7a0a48a891 · 2017-02-16T11:12:40.000+08:00
diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
@@ -165,6 +165,7 @@ func newIngressController(config *Configuration) *GenericController {
 			addIng := obj.(*extensions.Ingress)
 			if !IsValidClass(addIng, config.IngressClass) {
 				glog.Infof("ignoring add for ingress %v based on annotation %v", addIng.Name, ingressClassKey)
+				ic.ingLister.Store.Delete(addIng)
 				return
 			}
 			ic.recorder.Eventf(addIng, api.EventTypeNormal, "CREATE", fmt.Sprintf("Ingress %s/%s", addIng.Namespace, addIng.Name))
@@ -183,6 +184,7 @@ func newIngressController(config *Configuration) *GenericController {
 			oldIng := old.(*extensions.Ingress)
 			curIng := cur.(*extensions.Ingress)
 			if !IsValidClass(curIng, config.IngressClass) {
+				ic.ingLister.Store.Delete(curIng)
 				return
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ func newIngressController(config Configuration) GenericController {`
`165`	`165`	`addIng := obj.(*extensions.Ingress)`
`166`	`166`	`if !IsValidClass(addIng, config.IngressClass) {`
`167`	`167`	`glog.Infof("ignoring add for ingress %v based on annotation %v", addIng.Name, ingressClassKey)`
	`168`	`+ ic.ingLister.Store.Delete(addIng)`
`168`	`169`	`return`
`169`	`170`	`}`
`170`	`171`	`ic.recorder.Eventf(addIng, api.EventTypeNormal, "CREATE", fmt.Sprintf("Ingress %s/%s", addIng.Namespace, addIng.Name))`
`@@ -183,6 +184,7 @@ func newIngressController(config Configuration) GenericController {`
`183`	`184`	`oldIng := old.(*extensions.Ingress)`
`184`	`185`	`curIng := cur.(*extensions.Ingress)`
`185`	`186`	`if !IsValidClass(curIng, config.IngressClass) {`
	`187`	`+ ic.ingLister.Store.Delete(curIng)`
`186`	`188`	`return`
`187`	`189`	`}`
`188`	`190`