Merge bc02678106 into 74aff2eb7e

2017-04-19 21:51:19 +00:00 · 2017-04-19 21:51:19 +00:00 · 30e35b6add
commit 30e35b6add
parent 74aff2eb7e bc02678106
1 changed files with 1 additions and 1 deletions
--- a/core/pkg/ingress/controller/controller.go
+++ b/core/pkg/ingress/controller/controller.go
@ -654,7 +654,7 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
 								isHTTPSfrom = append(isHTTPSfrom, server)
 							}
 						}
-					} else {
+					} else if !upstream.Secure {
 						isHTTP = true
 					}
 				}