Merge branch 'refs/heads/release-0.29' into merge-9b82051284733018a2b…

…d2b2666f247b7b97764a6
sayboras · Oct 3, 2020 · 4e74946 · 4e74946
2 parents 1ece6dc + 9b82051
commit 4e74946
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/pkg/ctl/create/cluster.go b/pkg/ctl/create/cluster.go
@@ -355,15 +355,10 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params
 			return err
 		}
 
-		// tasks depending on the control plane availability
-		tasks := ctl.NewTasksRequiringControlPlane(cfg)
 		ngTasks := ctl.ClusterTasksForNodeGroups(cfg, params.InstallNeuronDevicePlugin)
-		if ngTasks.Len() > 0 {
-			tasks.Append(ngTasks)
-		}
 
-		logger.Info(tasks.Describe())
-		if errs := tasks.DoAllSync(); len(errs) > 0 {
+		logger.Info(ngTasks.Describe())
+		if errs := ngTasks.DoAllSync(); len(errs) > 0 {
 			logger.Warning("%d error(s) occurred and post actions have failed, you may wish to check CloudFormation console", len(errs))
 			logger.Info("to cleanup resources, run 'eksctl delete cluster --region=%s --name=%s'", meta.Region, meta.Name)
 			for _, err := range errs {

diff --git a/pkg/eks/tasks.go b/pkg/eks/tasks.go
@@ -203,21 +203,12 @@ func (c *ClusterProvider) CreateExtraClusterConfigTasks(cfg *api.ClusterConfig,
 			spec:            cfg,
 		})
 	}
-	return newTasks
-}
 
-// NewTasksRequiringControlPlane returns all tasks for updating cluster configuration depending on the control plane availability
-// or nil if there are no tasks
-func (c *ClusterProvider) NewTasksRequiringControlPlane(cfg *api.ClusterConfig) *manager.TaskTree {
-	tasks := &manager.TaskTree{
-		Parallel:  false,
-		IsSubTask: true,
-	}
 	if api.IsEnabled(cfg.IAM.WithOIDC) {
-		c.appendCreateTasksForIAMServiceAccounts(cfg, tasks)
+		c.appendCreateTasksForIAMServiceAccounts(cfg, newTasks)
 	}
 
-	return tasks
+	return newTasks
 }
 
 // ClusterTasksForNodeGroups returns all tasks dependent on node groups