Merge pull request #278 from pleshakov/fix-mergeable-ingresses

Fix mergeable Ingress types
nginx · Apr 30, 2018 · 49ddc53 · 49ddc53
2 parents 9b6a367 + 9735a2c
commit 49ddc53
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/nginx-controller/nginx/configurator.go b/nginx-controller/nginx/configurator.go
@@ -244,11 +244,15 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
 		rootLocation := false
 
 		grpcOnly := true
-		for _, path := range rule.HTTP.Paths {
-			if _, exists := grpcServices[path.Backend.ServiceName]; !exists {
-				grpcOnly = false
-				break
+		if len(grpcServices) > 0 {
+			for _, path := range rule.HTTP.Paths {
+				if _, exists := grpcServices[path.Backend.ServiceName]; !exists {
+					grpcOnly = false
+					break
+				}
 			}
+		} else {
+			grpcOnly = false
 		}
 
 		for _, path := range rule.HTTP.Paths {