Merge pull request #2520 from pmorillon/unset_proxy_env_vars_when_using_bastion

Unset proxy env vars when using bastion

cluster/cluster.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"os"
 	"reflect"
 	"strings"
 	"time"
@@ -779,6 +780,12 @@ func (c *Cluster) SetupDialers(ctx context.Context, dailersOptions hosts.Dialers
 		if err != nil {
 			return err
 		}
+		if c.BastionHost.IgnoreProxyEnvVars {
+			logrus.Debug("Unset http proxy environment variables")
+			for _, v := range util.ProxyEnvVars {
+				os.Unsetenv(v)
+			}
+		}
 	}
 	return nil
 }