Don't wait for metrics-server if its the only add-on (#8552)

Author: NicholasBlaskey

pkg/actions/addon/addon_helper.go

@@ -37,3 +37,17 @@ func (a *Helper) ValidateNodeGroupCreation(ctx context.Context) error {
 	}
 	return nil
 }
+
+func ShouldWaitForAddons(nodes bool, addons []*api.Addon) bool {
+	addonsRequireWait := false
+	for _, a := range addons {
+		addonInfo, ok := api.KnownAddons[a.Name]
+		// Assume unknown add-ons need to wait.
+		if !ok || !addonInfo.DontRequireWait {
+			addonsRequireWait = true
+			break
+		}
+	}
+
+	return nodes && addonsRequireWait
+}

pkg/actions/addon/addon_test.go

@@ -17,3 +17,32 @@ var _ = Describe("Addon", func() {
 		})
 	})
 })
+
+var _ = Describe("ShouldWaitForAddons", func() {
+	It("returns false when nodes is false", func() {
+		addons := []*api.Addon{{Name: api.VPCCNIAddon}}
+		Expect(addon.ShouldWaitForAddons(false, addons)).To(BeFalse())
+	})
+
+	It("returns false when no addons", func() {
+		Expect(addon.ShouldWaitForAddons(true, nil)).To(BeFalse())
+	})
+
+	It("returns false for metrics-server", func() {
+		addons := []*api.Addon{{Name: api.MetricsServerAddon}}
+		Expect(addon.ShouldWaitForAddons(true, addons)).To(BeFalse())
+	})
+
+	It("returns true for unknown addons", func() {
+		addons := []*api.Addon{{Name: "unknown-addon"}}
+		Expect(addon.ShouldWaitForAddons(true, addons)).To(BeTrue())
+	})
+
+	It("returns true when any addon requires wait", func() {
+		addons := []*api.Addon{
+			{Name: api.MetricsServerAddon},
+			{Name: "unknown-addon"},
+		}
+		Expect(addon.ShouldWaitForAddons(true, addons)).To(BeTrue())
+	})
+})

pkg/actions/addon/tasks.go

@@ -82,7 +82,7 @@ func CreateAddonTasks(ctx context.Context, cfg *api.ClusterConfig, clusterProvid
 		preTasks.Append(makeAddonTask(preAddons, false))
 	}
 	if len(postAddons) > 0 {
-		postTasks.Append(makeAddonTask(postAddons, cfg.HasNodes()))
+		postTasks.Append(makeAddonTask(postAddons, ShouldWaitForAddons(cfg.HasNodes(), postAddons)))
 	}
 	var updateVPCCNI *tasks.GenericTask
 	if vpcCNIAddon != nil && api.IsEnabled(cfg.IAM.WithOIDC) {

pkg/apis/eksctl.io/v1alpha5/known_addons.go

@@ -6,6 +6,7 @@ var KnownAddons = map[string]struct {
 	IsDefault             bool
 	CreateBeforeNodeGroup bool
 	IsDefaultAutoMode     bool
+	DontRequireWait       bool
 	ExcludedRegions       []string
 }{
 	VPCCNIAddon: {
@@ -41,6 +42,10 @@ var KnownAddons = map[string]struct {
 			RegionUSISOFSouth1,
 			RegionEUISOEWest1,
 		},
+		// Don't require waiting for metrics-server to be up if it's the only add-on to wait for.
+		// This is because this add-on is installed by default and we don't
+		// want to make a large change blocking cluster creating on this add-on coming up successfully in setups.
+		DontRequireWait: true,
 	},
 }