gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-22 00:06:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #671 from gravitl/bugfix_v0.10.0_leave

Browse source 
added wipelocal on all leaves
This commit is contained in:
dcarns 2022-02-04 11:35:45 -05:00 committed by GitHub
parent cf6bb710f7 85c9d3575a
commit 6db088a959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
netclient/functions/common.go
View file

@ -198,6 +198,13 @@ func LeaveNetwork(network string) error {
_, _ = ncutils.RunCmd("ip -4 route del "+node.NetworkSettings.AddressRange+" dev "+node.Interface, false)
}
err = WipeLocal(node.Network)
if err != nil {
ncutils.PrintLog("unable to wipe local config", 1)
} else {
ncutils.PrintLog("removed "+node.Network+" network locally", 1)
}
currentNets, err := ncutils.GetSystemNetworks()
if err != nil || len(currentNets) <= 1 {
return RemoveLocalInstance(cfg, network)
@ -207,22 +214,17 @@ func LeaveNetwork(network string) error {
// RemoveLocalInstance - remove all netclient files locally for a network
func RemoveLocalInstance(cfg *config.ClientConfig, networkName string) error {
err := WipeLocal(networkName)
if err != nil {
ncutils.PrintLog("unable to wipe local config", 1)
} else {
ncutils.PrintLog("removed "+networkName+" network locally", 1)
}
if cfg.Daemon != "off" {
if ncutils.IsWindows() {
// TODO: Remove job?
} else if ncutils.IsMac() {
//TODO: Delete mac daemon
} else {
err = daemon.RemoveSystemDServices()
daemon.RemoveSystemDServices()
}
}
return err
return nil
}
// DeleteInterface - delete an interface of a network