feat: support for multiple external network #2695

shane965 · 2023-04-21T06:00:42Z

Make sure you have followed Kube-OVN Code Style.

What type of this PR

Examples of user facing changes:

Features

Which issue(s) this PR fixes:

Fixes #2679

WHAT

`🤖 Generated by Copilot at d2a7462`

This pull request adds support for multiple external subnets for NAT gateway and EIP scenarios. It introduces a new External field for the SubnetSpec type and a new ExternalSubnet field for the VpcNatSpec and IptablesEipSpec types. It also refactors the controller logic and the CRD schemas to use these fields instead of the hardcoded VpcExternalNet constant.

`🤖 Generated by Copilot at d2a7462`

ExternalSubnet
A new field for EIP, NAT
Autumn of hardcodes

HOW

`🤖 Generated by Copilot at d2a7462`

Add External field to SubnetSpec type and schema to indicate external subnets (link, link)
Add ExternalSubnet field to VpcNatSpec and IptablesEipSpec types and schemas to specify external subnet name for NAT gateway and EIP (link, link, link, link)
Use ExternalSubnet field of EIP to get IP and MAC from IPAM, set EIP CIDR, update EIP CR, and enqueue subnet for status update (link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link)
Use ExternalSubnet field of NAT gateway to get external gateway and CIDR, set attachment network annotation, and update route rules for NAT gateway pod (link, link, link)
Use External field of subnet to count and list EIPs in subnet usage and status (link, link)
Remove VpcExternalNet constant and checkVpcExternalNet function as they are no longer needed (link, link)
Remove MACVLAN_NAD_PROVIDER constant as it is no longer fixed to VpcExternalNet network attachment definition (link)

github-actions · 2023-04-21T06:01:07Z

The commit message should be more descriptive and informative. It should provide a clear idea of what changes have been made in the code patch.
There are no potential bugs or format errors found in the code patch.
The performance of the code patch needs to be evaluated thoroughly to ensure that it does not impact the overall performance of the system.
The code patch could benefit from additional comments and documentation to make it easier for other developers to understand and maintain the code.
The code patch could be improved by following best practices and coding standards, such as using meaningful variable names and avoiding hard-coded values.

pkg/apis/kubeovn/v1/types.go

pkg/controller/init.go

pkg/util/const.go

github-actions · 2023-04-21T08:51:21Z

The commit message should be more descriptive and informative. It should provide a clear idea of what changes have been made in the patch.
There are no potential bugs or format errors found in the patch diff.
It is difficult to comment on performance issues without knowing the context of the code. However, it is always good to optimize the code for better performance if possible.
Ways to improve the patch could include adding comments to explain complex logic or improving variable names for better readability.

yamls/crd.yaml

github-actions · 2023-04-21T09:36:55Z

The commit message should be more descriptive and informative. It should clearly state what changes were made and why.
There are no potential bugs or format errors in the diff.
It is difficult to assess performance issues without further context on the codebase and the changes made.
Ways to improve could include adding comments to explain complex logic, refactoring repetitive code, or optimizing algorithms for better performance.

…t-multiple-external-network

github-actions · 2023-04-21T09:40:06Z

The commit message should be more descriptive and informative. It should clearly state what changes were made and why they were necessary.
There are no potential bugs or format errors in the diff.
It is difficult to assess performance issues without more context about the code being modified.
It would be helpful to include comments in the code explaining the purpose of each change and how it improves the overall functionality.
Consider adding unit tests to ensure that the changes do not introduce new bugs or regressions.

bobz965 · 2023-04-22T01:12:48Z

before you test this branch, you need to do the following steps:

# patch the external flag of subnet
kubectl patch subnets.kubeovn.io ovn-vpc-external-network --type merge --patch '{"spec": {"external": true}}'
# patch the externalSubnet of eip
kubectl patch iptables-eips.kubeovn.io {your eips} --type merge --patch '{"spec": {"externalSubnet": "ovn-vpc-external-network"}}'
# restart kube-ovn-controller
kubectl delete pod -n kube-system kube-ovn-controller

这些应该不需要做了吧？

shane965 · 2023-04-22T02:34:40Z

before you test this branch, you need to do the following steps:

# patch the external flag of subnet
kubectl patch subnets.kubeovn.io ovn-vpc-external-network --type merge --patch '{"spec": {"external": true}}'
# patch the externalSubnet of eip
kubectl patch iptables-eips.kubeovn.io {your eips} --type merge --patch '{"spec": {"externalSubnet": "ovn-vpc-external-network"}}'
# restart kube-ovn-controller
kubectl delete pod -n kube-system kube-ovn-controller

这些应该不需要做了吧？

已删除

…t-multiple-external-network

oilbeater · 2023-04-26T02:52:50Z

Please rebase the master and resolve the conflict

…t-multiple-external-network

github-actions · 2023-04-26T03:03:49Z

The commit message should be more descriptive and informative. It should clearly state what changes were made and why they were necessary.
There are no potential bugs or format errors in the diff.
It is difficult to assess performance issues without more context about the code being changed.
It would be helpful to include comments in the code explaining the purpose of each change and how it improves the overall functionality.
Consider adding unit tests to ensure that the changes do not introduce new bugs or regressions.

shane965 · 2023-04-26T11:01:23Z

pkg/apis/kubeovn/v1/types.go

+	MacAddress      string   `json:"macAddress"`
+	NatGwDp         string   `json:"natGwDp"`
+	QoSPolicy       string   `json:"qosPolicy"`
+	ExternalSubnets []string `json:"externalSubnets"`


IptablesEipSpec支持多个子网好像没有意义，这里应该用ExternalSubnet string json:"externalSubnet"就可以了

可能后续需要支持单个nat gw pod 支持动态添加网卡的方式扩展到多个网段，源进源出，一个网卡加一张路由表

目前这样也行，后续加那个功能的时候，我们再改

…t-multiple-external-network

github-actions · 2023-04-27T00:34:16Z

The commit message should be more descriptive and informative. It should clearly state what changes were made and why.
There are no potential bugs or format errors in the patch diff.
It is difficult to assess performance issues without further context on the codebase and the changes made.
Ways to improve could include adding comments to explain complex logic or improving variable naming for better readability.

shane965 · 2023-04-27T01:29:57Z

in order to keep the commit history clean, close the PR and create a new one. #2725

feat: support for multiple external network

d2a7462

bobz965 reviewed Apr 21, 2023

View reviewed changes

pkg/apis/kubeovn/v1/types.go Outdated Show resolved Hide resolved

pkg/apis/kubeovn/v1/types.go Outdated Show resolved Hide resolved

pkg/controller/init.go Show resolved Hide resolved

pkg/util/const.go Show resolved Hide resolved

fix: improve compatibility

d62ea89

shane965 marked this pull request as ready for review April 21, 2023 08:51

bobz965 reviewed Apr 21, 2023

View reviewed changes

yamls/crd.yaml Outdated Show resolved Hide resolved

update eip and vpcnat yaml

cc18157

Merge branch 'master' of https://github.com/kubeovn/kube-ovn into fea…

3e3c697

…t-multiple-external-network

bobz965 approved these changes Apr 21, 2023

View reviewed changes

bobz965 requested a review from hongzhen-ma April 21, 2023 09:52

Merge branch 'master' of https://github.com/kubeovn/kube-ovn into fea…

783e739

…t-multiple-external-network

Merge branch 'master' of https://github.com/kubeovn/kube-ovn into fea…

c295792

…t-multiple-external-network

shane965 commented Apr 26, 2023

View reviewed changes

shane965 added 2 commits April 26, 2023 11:36

fix: EIP externalSubnets -> externalSubnet

d85e92a

Merge branch 'master' of https://github.com/kubeovn/kube-ovn into fea…

3b387c6

…t-multiple-external-network

shane965 closed this Apr 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support for multiple external network #2695

feat: support for multiple external network #2695

shane965 commented Apr 21, 2023 •

edited by ghost

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

bobz965 commented Apr 22, 2023

shane965 commented Apr 22, 2023

oilbeater commented Apr 26, 2023

github-actions bot commented Apr 26, 2023

shane965 Apr 26, 2023

bobz965 Apr 26, 2023

bobz965 Apr 26, 2023

github-actions bot commented Apr 27, 2023

shane965 commented Apr 27, 2023

feat: support for multiple external network #2695

feat: support for multiple external network #2695

Conversation

shane965 commented Apr 21, 2023 • edited by ghost

What type of this PR

Which issue(s) this PR fixes:

WHAT

🤖 Generated by Copilot at d2a7462

🤖 Generated by Copilot at d2a7462

HOW

🤖 Generated by Copilot at d2a7462

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

github-actions bot commented Apr 21, 2023

bobz965 commented Apr 22, 2023

shane965 commented Apr 22, 2023

oilbeater commented Apr 26, 2023

github-actions bot commented Apr 26, 2023

shane965 Apr 26, 2023

Choose a reason for hiding this comment

bobz965 Apr 26, 2023

Choose a reason for hiding this comment

bobz965 Apr 26, 2023

Choose a reason for hiding this comment

github-actions bot commented Apr 27, 2023

shane965 commented Apr 27, 2023

shane965 commented Apr 21, 2023 •

edited by ghost

`🤖 Generated by Copilot at d2a7462`

`🤖 Generated by Copilot at d2a7462`

`🤖 Generated by Copilot at d2a7462`