createNode: fix log output generating nil pointer...

... dereference in addNodeToCluster when cluster does not exist. Fixes #277
k3d-io · Jun 12, 2020 · 2d0ec0a · 2d0ec0a
1 parent e7ffd18
commit 2d0ec0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/create/createNode.go b/cmd/create/createNode.go
@@ -49,7 +49,7 @@ func NewCmdCreateNode() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			nodes, cluster := parseCreateNodeCmd(cmd, args)
 			if err := k3dc.AddNodesToCluster(cmd.Context(), runtimes.SelectedRuntime, nodes, cluster, createNodeOpts); err != nil {
-				log.Errorf("Failed to add nodes '%+v' to cluster '%s'", nodes, cluster.Name)
+				log.Errorf("Failed to add nodes to cluster '%s'", nodes, cluster.Name)
 				log.Errorln(err)
 			}
 		},

diff --git a/pkg/cluster/node.go b/pkg/cluster/node.go
@@ -38,9 +38,10 @@ import (
 
 // AddNodeToCluster adds a node to an existing cluster
 func AddNodeToCluster(ctx context.Context, runtime runtimes.Runtime, node *k3d.Node, cluster *k3d.Cluster, createNodeOpts k3d.CreateNodeOpts) error {
+	targetClusterName := cluster.Name
 	cluster, err := GetCluster(ctx, runtime, cluster)
 	if err != nil {
-		log.Errorf("Failed to find specified cluster '%s'", cluster.Name)
+		log.Errorf("Failed to find specified cluster '%s'", targetClusterName)
 		return err
 	}