Merge pull request #308 from thedadams/fix-machine-client

rancher · Nov 10, 2021 · a56eac0 · a56eac0
2 parents 7e32bb2 + a920418
commit a56eac0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -110,7 +110,7 @@ func getNodeAndKey(ctx *cli.Context, c *cliclient.MasterClient, nodeName string)
 	link := sshNode.Links["nodeConfig"]
 	if link == "" {
 		// Get the machine and use that instead.
-		machine, err := getMachineByNodeName(ctx, c, nodeName)
+		machine, err := getMachineByNodeName(ctx, c, sshNode.NodeName)
 		if err != nil {
 			return sshNode, nil, fmt.Errorf("failed to find SSH key for node [%s]", nodeName)
 		}

diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/rancher/norman v0.0.0-20200820172041-261460ee9088
-	github.com/rancher/rancher/pkg/client v0.0.0-20211102002137-7a574e4a17ae
+	github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.22.5

diff --git a/go.sum b/go.sum
@@ -406,8 +406,8 @@ github.com/rancher/lasso v0.0.0-20200515155337-a34e1e26ad91/go.mod h1:G6Vv2aj6xB
 github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0/go.mod h1:OhBBBO1pBwYp0hacWdnvSGOj+XE9yMLOLnaypIlic18=
 github.com/rancher/norman v0.0.0-20200820172041-261460ee9088 h1:7Y2H44mpeA3ZCiGkdauhRo7EN+B4a3bbBg9dkNY4HO8=
 github.com/rancher/norman v0.0.0-20200820172041-261460ee9088/go.mod h1:W9LfZ96OfjkWSGTy2DUqYPt47Jpzrs7eM0i3AAx6fOI=
-github.com/rancher/rancher/pkg/client v0.0.0-20211102002137-7a574e4a17ae h1:ZaYn5rxP+x8yHsVZ5pQ47HW5CB42/hZPQ+61YjChePM=
-github.com/rancher/rancher/pkg/client v0.0.0-20211102002137-7a574e4a17ae/go.mod h1:UKAFuyRUIHtnss0+u3/21KZzsD4F/1IaHCBazsHKaww=
+github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473 h1:ApjHsieVqHAZB8NZAt1/ggKu91QCpUo0Wp/DiWHYSkc=
+github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473/go.mod h1:UKAFuyRUIHtnss0+u3/21KZzsD4F/1IaHCBazsHKaww=
 github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f/go.mod h1:NmtmlLkchboIksYJuBemwcP4RBfv8FpeyhVoWXB9Wdc=
 github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106 h1:ed0NTDvIwulez4zVvBZ1U7mFe2PBxtHvJ9bn2l9bcZ8=
 github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106/go.mod h1:iKqQcYs4YSDjsme52OZtQU4jHPmLlIiM93aj2c8c/W8=