fix issues with context.Context and remove LOG_LEVEL=debug in e2e test

k3d-io · Jun 3, 2020 · ad06e90 · ad06e90
1 parent e3bf186
commit ad06e90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/get/getClusterToken.go b/cmd/get/getClusterToken.go
@@ -60,13 +60,13 @@ func NewCmdGetClusterToken() *cobra.Command {
 
 			// generate list of clusters
 			if getClusterTokenFlags.validableFlags.All {
-				clusters, err = cluster.GetClusters(runtimes.SelectedRuntime)
+				clusters, err = cluster.GetClusters(cmd.Context(), runtimes.SelectedRuntime)
 				if err != nil {
 					log.Fatalln(err)
 				}
 			} else {
 				for _, clusterName := range args {
-					retrievedCluster, err := cluster.GetCluster(&k3d.Cluster{Name: clusterName}, runtimes.SelectedRuntime)
+					retrievedCluster, err := cluster.GetCluster(cmd.Context(), runtimes.SelectedRuntime, &k3d.Cluster{Name: clusterName})
 					if err != nil {
 						log.Fatalln(err)
 					}

diff --git a/tests/test_full_lifecycle.sh b/tests/test_full_lifecycle.sh
@@ -40,7 +40,7 @@ check_multi_node "$clustername" 2 || failed "failed to verify number of nodes"
 
 # 4. adding another worker node
 info "Adding one worker node..."
-LOG_LEVEL=debug $EXE create node "extra-worker" --cluster "$clustername" --role "worker" --wait --timeout 360s || failed "failed to add worker node"
+$EXE create node "extra-worker" --cluster "$clustername" --role "worker" --wait --timeout 360s || failed "failed to add worker node"
 
 info "Checking that we have 3 nodes available now..."
 check_multi_node "$clustername" 3 || failed "failed to verify number of nodes"