From e18dd8ff3485ed3cdaa37ecc954621b6be55b7f9 Mon Sep 17 00:00:00 2001
From: Jake <jake@weave.works>
Date: Tue, 12 Oct 2021 11:54:07 +0100
Subject: [PATCH] wait for addons to be healthy only if there are nodegroups

---
 pkg/actions/addon/tasks.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/actions/addon/tasks.go b/pkg/actions/addon/tasks.go
index e8ce296128..49bb5f3a12 100644
--- a/pkg/actions/addon/tasks.go
+++ b/pkg/actions/addon/tasks.go
@@ -31,6 +31,7 @@ func CreateAddonTasks(cfg *api.ClusterConfig, clusterProvider *eks.ClusterProvid
 			clusterProvider: clusterProvider,
 			forceAll:        forceAll,
 			timeout:         timeout,
+			wait:            false,
 		},
 	)
 
@@ -42,6 +43,7 @@ func CreateAddonTasks(cfg *api.ClusterConfig, clusterProvider *eks.ClusterProvid
 			clusterProvider: clusterProvider,
 			forceAll:        forceAll,
 			timeout:         timeout,
+			wait:            len(cfg.NodeGroups) > 0 || len(cfg.ManagedNodeGroups) > 0,
 		},
 	)
 	return preTasks, postTasks
@@ -52,7 +54,7 @@ type createAddonTask struct {
 	cfg             *api.ClusterConfig
 	clusterProvider *eks.ClusterProvider
 	addons          []*api.Addon
-	forceAll        bool
+	forceAll, wait  bool
 	timeout         time.Duration
 }
 
@@ -89,7 +91,7 @@ func (t *createAddonTask) Do(errorCh chan error) error {
 		if t.forceAll {
 			a.Force = true
 		}
-		err := addonManager.Create(a, true)
+		err := addonManager.Create(a, t.wait)
 		if err != nil {
 			go func() {
 				errorCh <- err