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.

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

Jump to bottom

feat: add ovn dnat #2565

Merged
merged 5 commits into from
Mar 30, 2023
Merged

feat: add ovn dnat #2565

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bd7272
feat: ovn dnat
Mar 28, 2023
235a243
route lb
Mar 29, 2023
51e8fb6
modify variable name
Mar 29, 2023
658f835
modify variable name
Mar 29, 2023
fa4d44e
optimized code
Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkg/controller/ovn_dnat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,31 +575,31 @@ func (c *Controller) handleDelOvnDnatFinalizer(cachedDnat *kubeovnv1.OvnDnatRule
}

func (c *Controller) AddDnatRule(vpcName, dnatName, externalIp, internalIp, externalPort, internalPort, protocol string) error {
vip := net.JoinHostPort(externalIp, externalPort)
backendIp := net.JoinHostPort(internalIp, internalPort)
externalEndpoint := net.JoinHostPort(externalIp, externalPort)
internalEndpoint := net.JoinHostPort(internalIp, internalPort)

if err := c.ovnLegacyClient.CreateLoadBalancerRule(dnatName, vip, backendIp, protocol); err != nil {
if err := c.ovnLegacyClient.CreateLoadBalancerRule(dnatName, externalEndpoint, internalEndpoint, protocol); err != nil {
Copy link
Collaborator

Choose a reason for hiding this comment

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

使用 libovsdb api 替换原有 api 接口的操作，正在进行中，可以看下 LoadBalancer 的操作，是不是有新的api？
如果有的话，可以考虑替换为新的 api 接口

klog.Errorf("failed to create loadBalancer rule, %v", err)
return err
}

if err := c.ovnLegacyClient.AddLoadBalancerToLogicalRouter(dnatName, vpcName); err != nil {
klog.Errorf("failed to add loadBalancer to vpcName, %v", err)
klog.Errorf("failed to add loadBalancer to vpc Name, %v", err)
ShaPoHun marked this conversation as resolved.
Show resolved Hide resolved
return err
}
return nil
}

func (c *Controller) DelDnatRule(vpcName, dnatName, externalIp, externalPort string) error {
vip := net.JoinHostPort(externalIp, externalPort)
externalEndpoint := net.JoinHostPort(externalIp, externalPort)

if err := c.ovnLegacyClient.DeleteLoadBalancerVip(vip, dnatName); err != nil {
if err := c.ovnLegacyClient.DeleteLoadBalancerVip(externalEndpoint, dnatName); err != nil {
klog.Errorf("failed to delete loadBalancer rule, %v", err)
return err
}

if err := c.ovnLegacyClient.RemoveLoadBalancerFromLogicalRouter(dnatName, vpcName); err != nil {
klog.Errorf("failed to remove loadBalancer from vpcName, %v", err)
klog.Errorf("failed to remove loadBalancer from vpc Name, %v", err)
ShaPoHun marked this conversation as resolved.
Show resolved Hide resolved
return err
}
return nil
Expand Down