fix(edge) EE-1720 activate tunnel and remove proxy cache when needed (#5775)

Co-authored-by: Simon Meng <simon.meng@portainer.io>

api/http/proxy/factory/docker/access_control.go

@@ -122,17 +122,11 @@ func (transport *Transport) createPrivateResourceControl(resourceIdentifier stri
 }
 
 func (transport *Transport) getInheritedResourceControlFromServiceOrStack(resourceIdentifier, nodeName string, resourceType portainer.ResourceControlType, resourceControls []portainer.ResourceControl) (*portainer.ResourceControl, error) {
-	client := transport.dockerClient
-
-	if nodeName != "" {
-		dockerClient, err := transport.dockerClientFactory.CreateClient(transport.endpoint, nodeName)
-		if err != nil {
-			return nil, err
-		}
-		defer dockerClient.Close()
-
-		client = dockerClient
+	client, err := transport.dockerClientFactory.CreateClient(transport.endpoint, nodeName)
+	if err != nil {
+		return nil, err
 	}
+	defer client.Close()
 
 	switch resourceType {
 	case portainer.ContainerResourceControl:

api/http/proxy/factory/docker/transport.go

@@ -14,7 +14,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/client"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/docker"
 	"github.com/portainer/portainer/api/http/proxy/factory/utils"
@@ -33,7 +32,6 @@ type (
 		dataStore            portainer.DataStore
 		signatureService     portainer.DigitalSignatureService
 		reverseTunnelService portainer.ReverseTunnelService
-		dockerClient         *client.Client
 		dockerClientFactory  *docker.ClientFactory
 	}
 
@@ -63,11 +61,6 @@ type (
 
 // NewTransport returns a pointer to a new Transport instance.
 func NewTransport(parameters *TransportParameters, httpTransport *http.Transport) (*Transport, error) {
-	dockerClient, err := parameters.DockerClientFactory.CreateClient(parameters.Endpoint, "")
-	if err != nil {
-		return nil, err
-	}
-
 	transport := &Transport{
 		endpoint:             parameters.Endpoint,
 		dataStore:            parameters.DataStore,
@@ -75,7 +68,6 @@ func NewTransport(parameters *TransportParameters, httpTransport *http.Transport
 		reverseTunnelService: parameters.ReverseTunnelService,
 		dockerClientFactory:  parameters.DockerClientFactory,
 		HTTPTransport:        httpTransport,
-		dockerClient:         dockerClient,
 	}
 
 	return transport, nil

api/http/proxy/factory/docker/volumes.go

@@ -132,16 +132,12 @@ func (transport *Transport) decorateVolumeResourceCreationOperation(request *htt
 	volumeID := request.Header.Get("X-Portainer-VolumeName")
 
 	if volumeID != "" {
-		cli := transport.dockerClient
 		agentTargetHeader := request.Header.Get(portainer.PortainerAgentTargetHeader)
-		if agentTargetHeader != "" {
-			dockerClient, err := transport.dockerClientFactory.CreateClient(transport.endpoint, agentTargetHeader)
-			if err != nil {
-				return nil, err
-			}
-			defer dockerClient.Close()
-			cli = dockerClient
+		cli, err := transport.dockerClientFactory.CreateClient(transport.endpoint, agentTargetHeader)
+		if err != nil {
+			return nil, err
 		}
+		defer cli.Close()
 
 		_, err = cli.VolumeInspect(context.Background(), volumeID)
 		if err == nil {
@@ -223,10 +219,13 @@ func (transport *Transport) getDockerID() (string, error) {
 		}
 	}
 
-	cli := transport.dockerClient
-	defer cli.Close()
+	client, err := transport.dockerClientFactory.CreateClient(transport.endpoint, "")
+	if err != nil {
+		return "", err
+	}
+	defer client.Close()
 
-	info, err := cli.Info(context.Background())
+	info, err := client.Info(context.Background())
 	if err != nil {
 		return "", err
 	}

api/http/proxy/factory/kubernetes.go

@@ -52,7 +52,7 @@ func (factory *ProxyFactory) newKubernetesLocalProxy(endpoint *portainer.Endpoin
 
 func (factory *ProxyFactory) newKubernetesEdgeHTTPProxy(endpoint *portainer.Endpoint) (http.Handler, error) {
 	tunnel := factory.reverseTunnelService.GetTunnelDetails(endpoint.ID)
-	rawURL := fmt.Sprintf("http://localhost:%d", tunnel.Port)
+	rawURL := fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
 
 	endpointURL, err := url.Parse(rawURL)
 	if err != nil {