[fix]: delete the NIC regardless of whether the Pod was found or not. #4500
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
size:L
Signed-off-by: liyh <liyh@yusur.tech>
Signed-off-by: liyh <liyh@yusur.tech>
bobz965
reviewed
Sep 14, 2024
pkg/daemon/handler.go
Outdated
| vmName := pod.Annotations[fmt.Sprintf(util.VMAnnotationTemplate, podRequest.Provider)] | ||
| if vmName != "" { | ||
| podRequest.PodName = vmName | ||
| nicType = "veth-pair" |
There was a problem hiding this comment.
感觉像上面那样用个常量，用 nicType = util.VethType 会更好些
Signed-off-by: liyh <liyh@yusur.tgech>
bobz965
approved these changes
Sep 16, 2024
oilbeater
requested changes
Sep 17, 2024
| @@ -229,7 +229,7 @@ func (csh cniServerHandler) removeDefaultRoute(netns string, ipv4, ipv6 bool) er | |||
| return nil | |||
| } | |||
|
|
|||
| func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID, netns, deviceID, ifName, nicType, _ string) error { | |||
| func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID, netns, deviceID, ifName, nicType string) error { | |||
There was a problem hiding this comment.
这个参数在 windows 系统没有用到不需要修改
There was a problem hiding this comment.
"not enough arguments in call to csh.deleteNic", 前面的函数调用需要，这里得去掉最后一个参数了
added 2 commits
September 18, 2024 02:06
Signed-off-by: liyh <liyh@yusur.tgech>
Signed-off-by: liyh <liyh@yusur.tgech>
bobz965
pushed a commit
that referenced
this pull request
Oct 25, 2024
…#4500) * [fix]: delete the NIC regardless of whether the Pod was found or not. Signed-off-by: liyh <liyh@yusur.tech> * windows Remove Parameter Signed-off-by: liyh <liyh@yusur.tech> * -Using constants Signed-off-by: liyh <liyh@yusur.tgech> * Restore changes to Windows Signed-off-by: liyh <liyh@yusur.tgech> * Fix: Correct argument count for csh.deleteNic call Signed-off-by: liyh <liyh@yusur.tgech> --------- Signed-off-by: liyh <liyh@yusur.tech> Signed-off-by: liyh <liyh@yusur.tgech> Co-authored-by: liyh <liyh@yusur.tgech>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
What type of this PR
Examples of user facing changes:
Describe
当删除pod时，若pod被直接删除cni来不及处理时，通过
pod, err := csh.Controller.podsLister.Pods(podRequest.PodNamespace).Get(podRequest.PodName)获取pod进行后续的处理条件，会导致此时无法处理，直接在k8serrors.IsNotFound中返回。复现
例如 在pod的部署yaml中设置了terminationGracePeriodSeconds: 0，导致 Pod 在删除 Deployment 后被立即终止，而 CNI 插件的 handleDel 函数还没来得及处理删除网卡的操作。
使用 podRequest.ContainerID 来识别 Pod，而不是使用 podRequest.PodName。这样即使 Pod 已经被删除，CNI 插件仍然可以通过容器 ID 来删除网卡。
spec: containers: - name: iperf3-server image: harbor.yusur.tech/yusur_ovn/iperf3 args: ['-s','-p','5001'] resources: requests: yusur.tech/sriov_dpu: '1' limits: yusur.tech/sriov_dpu: '1' ports: - containerPort: 5001 name: server terminationGracePeriodSeconds: 0 nodeSelector: app: node1