Merge pull request #236 from nicknovitski/patch-1

Always respect `-ingress-class` option
nginx · Feb 9, 2018 · a3a7ca4 · a3a7ca4
2 parents 0dafb34 + cf2f370
commit a3a7ca4
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/nginx-controller/controller/controller.go b/nginx-controller/controller/controller.go
@@ -41,7 +41,6 @@ import (
 
 const (
 	ingressClassKey   = "kubernetes.io/ingress.class"
-	nginxIngressClass = "nginx"
 )
 
 // LoadBalancerController watches Kubernetes API and
@@ -1046,13 +1045,10 @@ func (lbc *LoadBalancerController) isNginxIngress(ing *extensions.Ingress) bool
 		if lbc.useIngressClassOnly {
 			return class == lbc.ingressClass
 		}
-		return class == nginxIngressClass || class == ""
+		return class == lbc.ingressClass || class == ""
 	} else {
-		if lbc.useIngressClassOnly {
-			return false
-		}
+		return ! lbc.useIngressClassOnly
 	}
-	return true
 }
 
 // ValidateSecret validates that the secret follows the TLS Secret format.