Skip to content
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.

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

Fix 1.12 ipam deletion #3554

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Conversation

bobz965
Copy link
Collaborator

@bobz965 bobz965 commented Dec 20, 2023

Pull Request

What type of this PR

Examples of user facing changes:

  • Bug fixes

handleAddPod: 将 IP CR 的创建放在 create LSP (会校验冲突)之后

handleDeletePod: 如果不保留 ip,则将 LSP,ip,ipam,sg 一并删除。

changeVMSubet: 多网卡可能误删除,虽然后续会重建出来。但是可能影响未变更网卡的网络。

Bug fixes
#3181

Which issue(s) this PR fixes

Fixes #(issue-number)

WHAT

copilot:summary

copilot:poem

HOW

copilot:walkthrough

@bobz965 bobz965 marked this pull request as ready for review December 20, 2023 11:53
@bobz965
Copy link
Collaborator Author

bobz965 commented Dec 20, 2023

@oilbeater , 和 1.11 合入的那个一致

@bobz965 bobz965 force-pushed the fix-1.12-ipam-deletion branch 2 times, most recently from d91b488 to dbb0193 Compare December 21, 2023 03:13
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@bobz965 bobz965 merged commit 82e11ec into kubeovn:master Dec 21, 2023
56 of 59 checks passed
@bobz965 bobz965 deleted the fix-1.12-ipam-deletion branch December 21, 2023 08:30
bobz965 added a commit that referenced this pull request Dec 21, 2023
* fix ipam deletion

* fix: change vm subnet


---------

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
bobz965 added a commit that referenced this pull request Dec 22, 2023
* fix ipam deletion

* fix: change vm subnet


---------

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
bobz965 added a commit that referenced this pull request Mar 22, 2024
* fix ipam deletion

* fix: change vm subnet

---------

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants