BUG: ingress status update with others controllers

Author: ivanmatmati

pkg/controller/builder.go

@@ -166,15 +166,14 @@ func (builder *Builder) Build() *HAProxyController {
 	prefix, errPrefix := utils.GetPodPrefix(os.Getenv("POD_NAME"))
 	logger.Error(errPrefix)
 
-	builder.store.UpdateStatusFunc = ingress.NewStatusIngressUpdater(builder.clientSet, builder.store, builder.osArgs.IngressClass, builder.osArgs.EmptyIngressClass, builder.annotations)
 	builder.store.GatewayControllerName = builder.osArgs.GatewayControllerName
 	gatewayManager := builder.gatewayManager
 	if gatewayManager == nil {
 		gatewayManager = gateway.New(builder.store, haproxy.HAProxyClient, builder.osArgs, builder.restClientSet)
 	}
 	updateStatusManager := builder.updateStatusManager
 	if updateStatusManager == nil {
-		updateStatusManager = status.New(builder.clientSet)
+		updateStatusManager = status.New(builder.clientSet, builder.osArgs.IngressClass, builder.osArgs.EmptyIngressClass)
 	}
 	return &HAProxyController{
 		osArgs:                   builder.osArgs,

pkg/controller/controller.go

@@ -121,8 +121,7 @@ func (c *HAProxyController) updateHAProxy() {
 		for _, ingResource := range namespace.Ingresses {
 			i := ingress.New(c.store, ingResource, c.osArgs.IngressClass, c.osArgs.EmptyIngressClass, c.annotations)
 			if !i.Supported(c.store, c.annotations) {
-				logger.Debugf("ingress '%s/%s' ignored: no matching IngressClass", ingResource.Namespace, ingResource.Name)
-				ingResource.Addresses = []string{""}
+				logger.Debugf("ingress '%s/%s' ignored: no matching", ingResource.Namespace, ingResource.Name)
 			} else {
 				c.reload = i.Update(c.store, c.haproxy, c.annotations) || c.reload
 			}

pkg/ingress/status.go

@@ -5,26 +5,12 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/haproxytech/kubernetes-ingress/pkg/annotations"
-	"github.com/haproxytech/kubernetes-ingress/pkg/store"
 	networkingv1 "k8s.io/api/networking/v1"
 	k8serror "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
-type UpdateStatus func(ingresses []*store.Ingress, publishServiceAddresses []string)
-
-func NewStatusIngressUpdater(client *kubernetes.Clientset, k store.K8s, class string, emptyClass bool, a annotations.Annotations) UpdateStatus {
-	return func(ingresses []*store.Ingress, publishServiceAddresses []string) {
-		for _, ingress := range ingresses {
-			if ing := New(k, ingress, class, emptyClass, a); ing != nil {
-				logger.Error(ing.UpdateStatus(client))
-			}
-		}
-	}
-}
-
 func (i *Ingress) UpdateStatus(client *kubernetes.Clientset) (err error) {
 	var lbi []networkingv1.IngressLoadBalancerIngress
 

pkg/status/updatestatus.go

@@ -9,19 +9,25 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+var logger = utils.GetLogger()
+
 type UpdateStatusManager interface {
 	AddIngress(ingress *ingress.Ingress)
 	Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (reload bool, err error)
 }
 
 type UpdateStatusManagerImpl struct {
-	updateIngresses []*ingress.Ingress
-	client          *kubernetes.Clientset
+	updateIngresses   []*ingress.Ingress
+	client            *kubernetes.Clientset
+	ingressClass      string
+	emptyIngressClass bool
 }
 
-func New(client *kubernetes.Clientset) UpdateStatusManager {
+func New(client *kubernetes.Clientset, ingressClass string, emptyIngressClass bool) UpdateStatusManager {
 	return &UpdateStatusManagerImpl{
-		client: client,
+		client:            client,
+		ingressClass:      ingressClass,
+		emptyIngressClass: emptyIngressClass,
 	}
 }
 
@@ -45,20 +51,21 @@ func (m *UpdateStatusManagerImpl) Update(k store.K8s, h haproxy.HAProxy, a annot
 			}
 
 			for _, ingResource := range namespace.Ingresses {
-				previousAddresses := ingResource.Addresses
-				i := ingress.New(k, ingResource, "haproxy", false, a)
+				i := ingress.New(k, ingResource, m.ingressClass, m.emptyIngressClass, a)
 				supported := i.Supported(k, a)
+
+				if (!supported && (len(ingResource.Addresses) == 0 || !utils.EqualSliceStringsWithoutOrder(k.PublishServiceAddresses, ingResource.Addresses))) ||
+					(supported && utils.EqualSliceStringsWithoutOrder(k.PublishServiceAddresses, ingResource.Addresses)) {
+					continue
+				}
+
 				if supported {
 					ingResource.Addresses = k.PublishServiceAddresses
+				} else {
+					ingResource.Addresses = []string{""}
 				}
-				// If ingress is not managed by us, three cases can occur:
-				// - it has no adddresses.
-				// - it has addresses and they are different (maybe managed by someone else).
-				// - it has addresses and they are ours. We managed it but not now anymore.
-				// You can see we can't easily manage the case when while the IC is stopped, the ingress switches to unmanaged state (ingress class change) and the publish service addresses have also changed.
-				if !supported && !utils.EqualSliceStringsWithoutOrder(previousAddresses, ingResource.Addresses) {
-					continue
-				}
+				logger.Debugf("new ingress status ip address of '%s/%s' will be %+v", ingResource.Namespace, ingResource.Name, ingResource.Addresses)
+
 				ingresses = append(ingresses, i)
 			}
 		}

pkg/store/store.go

@@ -30,7 +30,6 @@ type K8s struct {
 	IngressClasses          map[string]*IngressClass
 	SecretsProcessed        map[string]struct{}
 	BackendProcessed        map[string]struct{}
-	UpdateStatusFunc        func(ingresses []*Ingress, publishServiceAddresses []string)
 	GatewayClasses          map[string]*GatewayClass
 	GatewayControllerName   string
 	PublishServiceAddresses []string