Skip to content

fix issue 5167: Add Finalizer when create snat #5170

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.

Sign up for GitHub

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

Closed
QEDQCD wants to merge 5 commits into from
Closed

fix issue 5167: Add Finalizer when create snat #5170

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1a2472
fix issue 4803: The two names should have a containment relationship
Dec 9, 2024
556d4a9
fix issue 4803: The two names should have a containment relationship
Dec 9, 2024
a5cc329
Merge branch 'master' of github.com:QEDQCD/kube-ovn
Apr 21, 2025
0a660de
Merge branch 'master' of github.com:QEDQCD/kube-ovn
Apr 21, 2025
89a9fdd
fix issue 5167: Add Finalizer when create snat
Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/controller/vpc_nat_gw_nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,8 +961,7 @@ func (c *Controller) handleDelIptablesSnatFinalizer(key string) error {
return nil
}
newIptablesSnat := cachedIptablesSnat.DeepCopy()
controllerutil.RemoveFinalizer(newIptablesSnat, util.DepreciatedFinalizerName)
controllerutil.RemoveFinalizer(newIptablesSnat, util.KubeOVNControllerFinalizer)
controllerutil.AddFinalizer(newIptablesSnat, util.KubeOVNControllerFinalizer)
Copy link
Copy Markdown
Collaborator

@zbb88888 zbb88888 Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉有点不对劲：上面的 handleAddIptablesSnatFinalizer 是删除 finalizer，这里的 handleDelIptablesSnatFinalizer 是添加 finalizer。

patch, err := util.GenerateMergePatchPayload(cachedIptablesSnat, newIptablesSnat)
if err != nil {
klog.Errorf("failed to generate patch payload for iptables snat '%s', %v", cachedIptablesSnat.Name, err)
Expand Down
Loading