Automatic merge from release/2.1.0 -> release/2.2.0

* commit 'e5a2a9e850720c398a9f3b6f7ac863a519bd8f77':
  fix: reverseproxy out of fds

pkg/proxy/http.go

@@ -2,6 +2,7 @@ package proxy
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net/http"
 	"net/http/httputil"
@@ -48,8 +49,12 @@ func (p *SReverseProxy) ServeHTTP(ctx context.Context, w http.ResponseWriter, r
 	}
 	log.Debugf("Forwarding to servie: %q, url: %q", p.serviceName, remoteUrl.String())
 	proxy := httputil.NewSingleHostReverseProxy(remoteUrl)
+	proxy.Transport = &http.Transport{
+		Proxy:             http.ProxyFromEnvironment,
+		TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+		DisableKeepAlives: true,
+	}
 	r.Header.Del("Cookie")
 	r.Header.Del("X-Auth-Token")
 	proxy.ServeHTTP(w, r)
-	return
 }