Skip to content

fixes deprovision panic and recurring deployment doesn't exist error #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashraffouda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes deprovision panic and recurring deployment doesn't exist error #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/primitives/vm-light/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,12 @@ func (p *Manager) Deprovision(ctx context.Context, wl *gridtypes.WorkloadWithID)
log.Error().Err(err).Str("name", volName).Msg("failed to delete rootfs volume")
}

tapName := wl.ID.Unique(string(cfg.Network.Mycelium.Network))
if cfg.Network.Mycelium != nil {
tapName := wl.ID.Unique(string(cfg.Network.Mycelium.Network))

if err := network.Detach(ctx, tapName); err != nil {
return errors.Wrap(err, "could not clean up tap device")
if err := network.Detach(ctx, tapName); err != nil {
return errors.Wrap(err, "could not clean up tap device")
}
}

return nil
Expand Down
3 changes: 2 additions & 1 deletion pkg/provision/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,8 @@ func (e *NativeEngine) uninstallWorkload(ctx context.Context, wl *gridtypes.Work
Logger()

_, err := e.storage.Current(twin, deployment, name)
if errors.Is(err, ErrWorkloadNotExist) {
if errors.Is(err, ErrWorkloadNotExist) || errors.Is(err, ErrDeploymentNotExists) {
// workload or deployment doesn't exist in storage, consider it already deleted
return nil
} else if err != nil {
return err
Expand Down
Loading