ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #686 from silenceper/master

Browse Source 
Ignore NetNS path errors on delete
This commit is contained in:
Matt Dupre 2022-01-19 09:08:06 -08:00 committed by GitHub
commit de5cffee1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/main/bridge/bridge.go
View File

@ -672,6 +672,13 @@ func cmdDel(args *skel.CmdArgs) error {
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}

11
plugins/main/ipvlan/ipvlan.go
View File

@ -310,6 +310,17 @@ func cmdDel(args *skel.CmdArgs) error {
return nil
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}
return err
}

9
plugins/main/loopback/loopback.go
View File

@ -159,7 +159,14 @@ func cmdDel(args *skel.CmdArgs) error {
return nil
})
if err != nil {
return err // not tested
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}
return nil

11
plugins/main/macvlan/macvlan.go
View File

@ -367,6 +367,17 @@ func cmdDel(args *skel.CmdArgs) error {
return nil
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}
return err
}

7
plugins/main/ptp/ptp.go
View File

@ -292,6 +292,13 @@ func cmdDel(args *skel.CmdArgs) error {
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}

11
plugins/main/vlan/vlan.go
View File

@ -213,6 +213,17 @@ func cmdDel(args *skel.CmdArgs) error {
return err
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}
return err
}

11
plugins/meta/vrf/main.go
View File

@ -123,6 +123,17 @@ func cmdDel(args *skel.CmdArgs) error {
return nil
})
if err != nil {
// if NetNs is passed down by the Cloud Orchestration Engine, or if it called multiple times
// so don't return an error if the device is already removed.
// https://github.com/kubernetes/kubernetes/issues/43014#issuecomment-287164444
_, ok := err.(ns.NSPathNotExistErr)
if ok {
return nil
}
return err
}
if err != nil {
return fmt.Errorf("cmdDel failed: %v", err)
}