MINOR: support default IngressClass

IngressClass resources marked as default via
`ingressclass.kubernetes.io/is-default-class` annotations are now
supported.

Author: ivanmatmati

controller/ingress/ingress.go

@@ -59,26 +59,38 @@ func (i Ingress) supported(k8s store.K8s) (supported bool) {
 	if igClassResource := k8s.IngressClasses[i.resource.Class]; igClassResource != nil && igClassResource.Status != store.DELETED {
 		igClassSpec = igClassResource.Controller
 	}
-
-	defer func() {
-		if supported && i.resource.Ignored {
-			i.resource.Status = store.ADDED
-			i.resource.Ignored = false
+	if igClassAnn == "" && i.resource.Class == "" {
+		for _, ingressClass := range k8s.IngressClasses {
+			if ingressClass.Annotations["ingressclass.kubernetes.io/is-default-class"] == "true" {
+				igClassSpec = ingressClass.Controller
+				break
+			}
 		}
-	}()
-
-	emptyClass := igClassAnn == "" && i.resource.Class == ""
+	}
 
-	if i.controllerClass == "" {
-		supported = emptyClass || igClassSpec == CONTROLLER
-	} else {
-		supported = (emptyClass && i.allowEmptyClass) ||
-			igClassAnn == i.controllerClass ||
-			igClassSpec == filepath.Join(CONTROLLER, i.controllerClass)
+	switch i.controllerClass {
+	case "":
+		if igClassAnn == "" {
+			supported = (i.resource.Class == "" && igClassSpec == "") || igClassSpec == CONTROLLER
+		} else if igClassSpec == CONTROLLER {
+			logger.Warningf("Ingress '%s/%s': conflicting ingress class mechanisms", i.resource.Namespace, i.resource.Name)
+		}
+	case igClassAnn:
+		supported = true
+	default:
+		if igClassAnn == "" {
+			supported = i.resource.Class == "" && i.allowEmptyClass || igClassSpec == filepath.Join(CONTROLLER, i.controllerClass)
+		} else if igClassSpec == filepath.Join(CONTROLLER, i.controllerClass) {
+			logger.Warningf("Ingress '%s/%s': conflicting ingress class mechanisms", i.resource.Namespace, i.resource.Name)
+		}
 	}
 	if !supported {
 		i.resource.Ignored = true
 	}
+	if supported && i.resource.Ignored {
+		i.resource.Status = store.ADDED
+		i.resource.Ignored = false
+	}
 	return
 }
 

controller/store/convert.go

@@ -163,10 +163,15 @@ func (n ingressNetworkingV1Beta1Strategy) ConvertIngress() *Ingress {
 }
 
 func (n ingressNetworkingV1Beta1Strategy) ConvertClass() *IngressClass {
+	annotations := make(map[string]string, len(n.class.Annotations))
+	for key, value := range n.class.Annotations {
+		annotations[key] = value
+	}
 	return &IngressClass{
-		APIVersion: NETWORKINGV1BETA1,
-		Name:       n.class.GetName(),
-		Controller: n.class.Spec.Controller,
+		APIVersion:  NETWORKINGV1BETA1,
+		Name:        n.class.GetName(),
+		Controller:  n.class.Spec.Controller,
+		Annotations: annotations,
 		Status: func() Status {
 			if n.class.ObjectMeta.GetDeletionTimestamp() != nil {
 				return DELETED
@@ -353,10 +358,15 @@ func (n ingressNetworkingV1Strategy) ConvertIngress() *Ingress {
 }
 
 func (n ingressNetworkingV1Strategy) ConvertClass() *IngressClass {
+	annotations := make(map[string]string, len(n.class.Annotations))
+	for key, value := range n.class.Annotations {
+		annotations[key] = value
+	}
 	return &IngressClass{
-		APIVersion: NETWORKINGV1,
-		Name:       n.class.GetName(),
-		Controller: n.class.Spec.Controller,
+		APIVersion:  NETWORKINGV1,
+		Name:        n.class.GetName(),
+		Controller:  n.class.Spec.Controller,
+		Annotations: annotations,
 		Status: func() Status {
 			if n.class.ObjectMeta.GetDeletionTimestamp() != nil {
 				return DELETED

controller/store/types.go

@@ -95,10 +95,11 @@ type CustomResources struct {
 }
 
 type IngressClass struct {
-	APIVersion string
-	Name       string
-	Controller string
-	Status     Status
+	APIVersion  string
+	Name        string
+	Controller  string
+	Annotations map[string]string
+	Status      Status
 }
 
 // IngressPath is useful data from k8s structures about ingress path