MINOR: update status if ingressclass is accepted after an ingress modification

Author: ivanmatmati

main.go

@@ -113,7 +113,6 @@ func main() {
 		WithHaproxyCfgFile(haproxyConf).
 		WithEventChan(eventChan).
 		WithStore(s).
-		WithPublishService(publishService).
 		WithUpdatePublishServiceFunc(k.UpdatePublishService).
 		WithClientSet(k.GetClientset()).
 		WithRestClientSet(k.GetRestClientset()).

pkg/controller/builder.go

@@ -47,7 +47,6 @@ type Builder struct {
 	haproxyProcess           process.Process
 	haproxyRules             rules.Rules
 	restClientSet            client.Client
-	publishService           *utils.NamespaceValue
 	updatePublishServiceFunc func(ingresses []*ingress.Ingress, publishServiceAddresses []string)
 	eventChan                chan k8s.SyncDataEvent
 	clientSet                *kubernetes.Clientset
@@ -124,11 +123,6 @@ func (builder *Builder) WithArgs(osArgs utils.OSArgs) *Builder {
 	return builder
 }
 
-func (builder *Builder) WithPublishService(publishService *utils.NamespaceValue) *Builder {
-	builder.publishService = publishService
-	return builder
-}
-
 func (builder *Builder) WithUpdatePublishServiceFunc(updatePublishServiceFunc func(ingresses []*ingress.Ingress, publishServiceAddresses []string)) *Builder {
 	builder.updatePublishServiceFunc = updatePublishServiceFunc
 	return builder
@@ -183,7 +177,6 @@ func (builder *Builder) Build() *HAProxyController {
 		podPrefix:                prefix,
 		store:                    builder.store,
 		eventChan:                builder.eventChan,
-		publishService:           builder.publishService,
 		annotations:              builder.annotations,
 		chShutdown:               chShutdown,
 		updatePublishServiceFunc: builder.updatePublishServiceFunc,

pkg/controller/controller.go

@@ -37,7 +37,6 @@ var logger = utils.GetLogger()
 type HAProxyController struct {
 	gatewayManager           gateway.GatewayManager
 	annotations              annotations.Annotations
-	publishService           *utils.NamespaceValue
 	eventChan                chan k8s.SyncDataEvent
 	updatePublishServiceFunc func(ingresses []*ingress.Ingress, publishServiceAddresses []string)
 	chShutdown               chan struct{}
@@ -124,7 +123,7 @@ func (c *HAProxyController) updateHAProxy() {
 				logger.Debugf("ingress '%s/%s' ignored: no matching IngressClass", ingResource.Namespace, ingResource.Name)
 				continue
 			}
-			if ingResource.Status == store.ADDED {
+			if ingResource.Status == store.ADDED || ingResource.ClassUpdated {
 				ingresses = append(ingresses, i)
 			}
 			c.reload = i.Update(c.store, c.haproxy, c.annotations) || c.reload

pkg/store/events.go

@@ -62,6 +62,15 @@ func (k *K8s) EventIngress(ns *Namespace, data *Ingress) (updateRequired bool) {
 				updateRequired = false
 				data.Status = EMPTY
 			}
+			for _, update := range updated {
+				if strings.HasPrefix(update, "Class:") {
+					data.ClassUpdated = true
+					break
+				}
+			}
+			if data.Annotations["ingress.class"] != oldIngress.Annotations["ingress.class"] {
+				data.ClassUpdated = true
+			}
 		}
 		ns.Ingresses[data.Name] = data
 	}

pkg/store/types.go

@@ -134,9 +134,10 @@ type IngressRule struct {
 // Ingress is useful data from k8s structures about ingress
 type Ingress struct {
 	IngressCore
-	Status    Status // Used for store purpose
-	Addresses []string
-	Ignored   bool // true if resource ignored because of non matching Controller Class
+	Status       Status // Used for store purpose
+	Addresses    []string
+	Ignored      bool // true if resource ignored because of non matching Controller Class
+	ClassUpdated bool
 }
 
 // IngressTLS describes the transport layer security associated with an Ingress.