Skip to content

Commit 418cfca

Browse files
committed
fix(remove): Wait for instance to be removed before returning
Signed-off-by: Alexander Jung <alex@unikraft.io>
1 parent 7d94c48 commit 418cfca

File tree

1 file changed

+23
-1
lines changed
  • internal/cli/kraft/cloud/service/remove

1 file changed

+23
-1
lines changed

internal/cli/kraft/cloud/service/remove/remove.go

+23-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,29 @@ func Remove(ctx context.Context, opts *RemoveOptions, args ...string) error {
162162

163163
log.G(ctx).Infof("deleting %d instances...", len(instances))
164164

165-
_, err = opts.Client.Instances().WithMetro(opts.Metro).Delete(ctx, instances...)
165+
if _, err := opts.Client.Instances().WithMetro(opts.Metro).Delete(ctx, instances...); err != nil {
166+
return err
167+
}
168+
169+
// Wait until the instances are deleted
170+
for {
171+
resp, err := opts.Client.Instances().WithMetro(opts.Metro).Get(ctx, instances...)
172+
if err != nil {
173+
break
174+
}
175+
176+
noError := true
177+
for _, entry := range resp.Data.Entries {
178+
if entry.Status != "error" {
179+
noError = false
180+
}
181+
}
182+
183+
if noError {
184+
break
185+
}
186+
}
187+
166188
return err
167189
},
168190
),

0 commit comments

Comments
 (0)