Fix integration tests

Author: cPu1

integration/tests/bare_cluster/bare_cluster_test.go

@@ -56,6 +56,7 @@ var _ = Describe("Bare Clusters", Ordered, func() {
 			WithArgs(
 				"cluster",
 				"--config-file=-",
+				"--verbose", "4",
 				"--kubeconfig="+params.KubeconfigPath,
 			).
 			WithoutArg("--region", params.Region).

integration/tests/update/update_cluster_test.go

@@ -223,12 +223,15 @@ var _ = Describe("(Integration) Upgrading cluster", func() {
 
 	Context("addons", func() {
 		It("should upgrade kube-proxy", func() {
-			cmd := params.EksctlUtilsCmd.WithArgs(
-				"update-kube-proxy",
-				"--cluster", params.ClusterName,
-				"--verbose", "4",
-				"--approve",
-			)
+			cmd := params.EksctlUpdateCmd.
+				WithArgs(
+					"addon",
+					"--name", "kube-proxy",
+					"--cluster", params.ClusterName,
+					"--version", "latest",
+					"--wait",
+					"--verbose", "4",
+				)
 			Expect(cmd).To(RunSuccessfully())
 
 			rawClient := getRawClient(clusterProvider)
@@ -256,24 +259,29 @@ var _ = Describe("(Integration) Upgrading cluster", func() {
 			}
 			preUpdateAWSNodeVersion := getAWSNodeVersion()
 
-			cmd := params.EksctlUtilsCmd.WithArgs(
-				"update-aws-node",
-				"--cluster", params.ClusterName,
-				"--verbose", "4",
-				"--approve",
-			)
+			cmd := params.EksctlUpdateCmd.
+				WithArgs(
+					"addon",
+					"--name", "vpc-cni",
+					"--cluster", params.ClusterName,
+					"--version", "latest",
+					"--wait",
+					"--verbose", "4",
+				)
 			Expect(cmd).To(RunSuccessfully())
-
 			Eventually(getAWSNodeVersion, k8sUpdatePollTimeout, k8sUpdatePollInterval).ShouldNot(Equal(preUpdateAWSNodeVersion))
 		})
 
 		It("should upgrade coredns", func() {
-			cmd := params.EksctlUtilsCmd.WithArgs(
-				"update-coredns",
-				"--cluster", params.ClusterName,
-				"--verbose", "4",
-				"--approve",
-			)
+			cmd := params.EksctlUpdateCmd.
+				WithArgs(
+					"addon",
+					"--name", "coredns",
+					"--cluster", params.ClusterName,
+					"--version", "latest",
+					"--wait",
+					"--verbose", "4",
+				)
 			Expect(cmd).To(RunSuccessfully())
 		})
 

pkg/ctl/create/cluster.go

@@ -353,8 +353,6 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params
 	logger.Info("if you encounter any issues, check CloudFormation console or try 'eksctl utils describe-stacks --region=%s --cluster=%s'", meta.Region, meta.Name)
 
 	eks.LogEnabledFeatures(cfg)
-	postClusterCreationTasks := ctl.CreateExtraClusterConfigTasks(ctx, cfg)
-
 	iamRoleCreator := &podidentityassociation.IAMRoleCreator{
 		ClusterName:  cfg.Metadata.Name,
 		StackCreator: stackManager,
@@ -363,7 +361,7 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params
 	if len(autoDefaultAddons) > 0 {
 		logger.Info("default addons %s were not specified, will install them as EKS addons", strings.Join(autoDefaultAddons, ", "))
 	}
-	postClusterCreationTasks.Append(preNodegroupAddons)
+	postClusterCreationTasks := ctl.CreateExtraClusterConfigTasks(ctx, cfg, preNodegroupAddons)
 
 	taskTree := stackManager.NewTasksToCreateCluster(ctx, cfg.NodeGroups, cfg.ManagedNodeGroups, cfg.AccessConfig, makeAccessEntryCreator(cfg.Metadata.Name, stackManager), postClusterCreationTasks)
 

pkg/eks/tasks.go

@@ -181,10 +181,11 @@ func newEFADevicePluginTask(
 }
 
 // CreateExtraClusterConfigTasks returns all tasks for updating cluster configuration
-func (c *ClusterProvider) CreateExtraClusterConfigTasks(ctx context.Context, cfg *api.ClusterConfig) *tasks.TaskTree {
+func (c *ClusterProvider) CreateExtraClusterConfigTasks(ctx context.Context, cfg *api.ClusterConfig, preNodeGroupAddons *tasks.TaskTree) *tasks.TaskTree {
 	newTasks := &tasks.TaskTree{
 		Parallel:  false,
 		IsSubTask: true,
+		Tasks:     []tasks.Task{preNodeGroupAddons},
 	}
 
 	newTasks.Append(&tasks.GenericTask{