ignore nonexistent ns net file error when deleting container network #57697
Conversation
k8s-ci-robot
added
release-note
|
/unassign thockin dnardo |
|
@kubernetes/sig-network-misc |
|
/retest |
|
/cc @thockin |
pkg/kubelet/network/cni/cni.go
Outdated
| @@ -273,7 +273,7 @@ func (plugin *cniNetworkPlugin) deleteFromNetwork(network *cniNetwork, podName s | |||
| netConf, cniNet := network.NetworkConfig, network.CNIConfig | |||
| glog.V(4).Infof("About to del CNI network %v (type=%v)", netConf.Name, netConf.Plugins[0].Network.Type) | |||
| err = cniNet.DelNetworkList(netConf, rt) | |||
| if err != nil { | |||
| if err != nil && !strings.Contains(err.Error(), "no such file or directory") { | |||
There was a problem hiding this comment.
PLEASE PLEASE comment why this is acceptable.
There was a problem hiding this comment.
@thockin Addressed. PTAL. Thanks.
| @@ -765,7 +765,7 @@ func (plugin *kubenetNetworkPlugin) delContainerFromNetwork(config *libcni.Netwo | |||
| } | |||
|
|
|||
| glog.V(3).Infof("Removing %s/%s from '%s' with CNI '%s' plugin and runtime: %+v", namespace, name, config.Network.Name, config.Network.Type, rt) | |||
| if err := plugin.cniConfig.DelNetwork(config, rt); err != nil { | |||
| if err := plugin.cniConfig.DelNetwork(config, rt); err != nil && !strings.Contains(err.Error(), "no such file or directory") { | |||
There was a problem hiding this comment.
Same as above - this NEEDS a comment.
dixudx
force-pushed
the
ignore_nsnet_delete_error
branch
from
a14c06f to
92c9c9a
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dixudx, thockin Associated issue: #57465 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
k8s-ci-robot
added
the
approved
|
@dixudx: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
Automatic merge from submit-queue (batch tested with PRs 56952, 57697). If you want to cherry-pick this change to another branch, please follow the instructions here. |
What this PR does / why we need it:
The pod may not get deleted completely at the first time. Such
no such file or directoryerror should be ignored for retry logic.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #57465
Special notes for your reviewer:
/cc @kubernetes/sig-network-misc
Release note: