REORG/MINOR: reduce complexity in function called 'supported'

haproxytech · Nov 12, 2021 · 2edbf2c · 2edbf2c
1 parent 421eb4d
commit 2edbf2c
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/controller/ingress/ingress.go b/controller/ingress/ingress.go
@@ -67,30 +67,18 @@ func (i Ingress) supported(k8s store.K8s) (supported bool) {
 		}
 	}()
 
+	emptyClass := igClassAnn == "" && i.resource.Class == ""
+
 	if i.controllerClass == "" {
-		if igClassAnn == "" && i.resource.Class == "" {
-			supported = true
-			return
-		}
-		if igClassSpec == CONTROLLER {
-			supported = true
-			return
-		}
+		supported = emptyClass || igClassSpec == CONTROLLER
 	} else {
-		if igClassAnn == "" && i.resource.Class == "" && i.allowEmptyClass {
-			supported = true
-			return
-		}
-		if igClassAnn == i.controllerClass {
-			supported = true
-			return
-		}
-		if igClassSpec == filepath.Join(CONTROLLER, i.controllerClass) {
-			supported = true
-			return
-		}
+		supported = (emptyClass && i.allowEmptyClass) ||
+			igClassAnn == i.controllerClass ||
+			igClassSpec == filepath.Join(CONTROLLER, i.controllerClass)
+	}
+	if !supported {
+		i.resource.Ignored = true
 	}
-	i.resource.Ignored = true
 	return
 }