From 75dc16cf48dca3c59ec3ace4319935399355368b Mon Sep 17 00:00:00 2001 From: Atharva Joshi Date: Sat, 12 Sep 2026 17:47:56 +0530 Subject: [PATCH] chore: harden addon warning logging and empty drain Signed-off-by: Atharva Joshi --- pkg/actions/addon/create.go | 4 ++-- pkg/actions/nodegroup/drain.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/actions/addon/create.go b/pkg/actions/addon/create.go index 8a15a476bb..d679881954 100644 --- a/pkg/actions/addon/create.go +++ b/pkg/actions/addon/create.go @@ -267,11 +267,11 @@ func (a *Manager) Create(ctx context.Context, addon *api.Addon, iamRoleCreator I defer func() { deleteAddonIAMTasks, err := NewRemover(a.stackManager).DeleteAddonIAMTasksFiltered(ctx, addon.Name, false) if err != nil { - logger.Warning("failed to cleanup IAM role stacks: %w; please remove any remaining stacks manually", err) + logger.Warning("failed to cleanup IAM role stacks: %v; please remove any remaining stacks manually", err) return } if err := runAllTasks(deleteAddonIAMTasks); err != nil { - logger.Warning("failed to cleanup IAM role stacks: %w; please remove any remaining stacks manually", err) + logger.Warning("failed to cleanup IAM role stacks: %v; please remove any remaining stacks manually", err) } }() var addonServiceAccounts []string diff --git a/pkg/actions/nodegroup/drain.go b/pkg/actions/nodegroup/drain.go index 93f1d9f63f..3f840e228f 100644 --- a/pkg/actions/nodegroup/drain.go +++ b/pkg/actions/nodegroup/drain.go @@ -33,6 +33,9 @@ type Drainer struct { // Drain drains nodegroups. func (d *Drainer) Drain(ctx context.Context, input *DrainInput) error { + if len(input.NodeGroups) == 0 { + return nil + } parallelLimit := int64(input.Parallel) sem := semaphore.NewWeighted(parallelLimit) logger.Info("starting parallel draining, max in-flight of %d", parallelLimit)