rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 07:30:01 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2553 from kinarashah/dockerclient

Browse Source 
use docker client with api negotiation
This commit is contained in:
Kinara Shah
2021-05-27 13:34:17 -07:00
committed by GitHub
parent 4f9b161314 4c8b149835
commit b523c2b415
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/tunnel.go
View File

@@ -18,10 +18,6 @@ import (
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
) )
const (
DockerAPIVersion = "1.24"
)
func (h *Host) TunnelUp(ctx context.Context, dialerFactory DialerFactory, clusterPrefixPath string, clusterVersion string) error { func (h *Host) TunnelUp(ctx context.Context, dialerFactory DialerFactory, clusterPrefixPath string, clusterVersion string) error {
if h.DClient != nil { if h.DClient != nil {
return nil return nil
@@ -34,7 +30,7 @@ func (h *Host) TunnelUp(ctx context.Context, dialerFactory DialerFactory, cluste
// set Docker client // set Docker client
logrus.Debugf("Connecting to Docker API for host [%s]", h.Address) logrus.Debugf("Connecting to Docker API for host [%s]", h.Address)
h.DClient, err = client.NewClientWithOpts( h.DClient, err = client.NewClientWithOpts(
client.WithVersion(DockerAPIVersion), client.WithAPIVersionNegotiation(),
client.WithHTTPClient(httpClient)) client.WithHTTPClient(httpClient))
if err != nil { if err != nil {
return fmt.Errorf("Can't initiate NewClient: %v", err) return fmt.Errorf("Can't initiate NewClient: %v", err)