Fix proxy protocol check

This commit is contained in:
Manuel de Brito Fontes 2017-10-04 14:11:51 -03:00
parent 0f351e2b1c
commit c7bf08c263

View file

@ -32,7 +32,6 @@ import (
"github.com/pborman/uuid"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress/controllers/nginx/pkg/config"
@ -678,9 +677,7 @@ func trustHTTPHeaders(input interface{}) bool {
}
return conf.Cfg.RealClientFrom == "http-proxy" ||
(conf.Cfg.RealClientFrom == "auto" && !conf.Cfg.UseProxyProtocol ||
(conf.Cfg.RealClientFrom == "auto" && conf.PublishService != nil &&
conf.PublishService.Spec.Type == apiv1.ServiceTypeLoadBalancer))
(conf.Cfg.RealClientFrom == "auto" && !conf.Cfg.UseProxyProtocol)
}
func trustProxyProtocol(input interface{}) bool {