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

Nat reuse router port external ip #3313

Merged
merged 17 commits into from
Oct 24, 2023
Merged

Nat reuse router port external ip #3313

merged 17 commits into from
Oct 24, 2023

Conversation

zbb88888
Copy link
Collaborator

@zbb88888 zbb88888 commented Oct 19, 2023 •
edited
Loading

What type of this PR

Features

  • support ovn nat reuse lrp type eip
  • support ovn nat specify IP or IP cidr
  • ipam allocation should not return "nil" string, return ""(empty string) should be better
  • update ovn nat e2e
  • add independent vip e2e

limit gw nodes number to 2, in HA kind-init-ha env, we can have a normal worker node and two gw nodes.
use the ha env, we can tcpdump bfd packet between worker node and gw nodes in ovn ha chassis group case in the future.

#3287

WHAT

🤖 Generated by Copilot at ff9e3be

No summary available (Limit exceeded: required to process 52456 tokens, but only 50000 are allowed per call)

🤖 Generated by Copilot at 3d06a9f

Sing, O Muse, of the valiant deeds of the ovn developers
Who, with skill and wisdom, enhanced the vip and eip features
They added tests and validations, and refined the error messages
To make them clear and consistent, like the oracles of Delphi

HOW

🤖 Generated by Copilot at ff9e3be

No walkthrough available (Limit exceeded: required to process 52456 tokens, but only 50000 are allowed per call)

@zbb88888
nat could use lrp type ovn eip
953cb6e 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
nat support specify vpc ip
76ac58a 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
e2e
683556b 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
fix G307
35e30d4 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
update ovn nat webhook
529e938 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
test e2e
b00342d 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888 zbb88888 changed the title Nat reuse Nat reuse router Oct 23, 2023
@zbb88888 zbb88888 changed the title Nat reuse router Nat reuse router port eip Oct 23, 2023
@zbb88888 zbb88888 changed the title Nat reuse router port eip Nat reuse router port external ip Oct 23, 2023
@zbb88888 zbb88888 force-pushed the nat-reuse branch 3 times, most recently from 54e69ba to c3b79e3 Compare October 23, 2023 06:25
zbb88888 and others added 8 commits October 23, 2023 14:46
@zbb88888
add independent vip e2e
74102f7 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
update ovn vpc nat e2e about nats use ip or ip cidr
8853890 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
fix e2e
862099a 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
fix golint
3a9b9ba 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888
fix comment
0e568e8 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@dependabot @zbb88888
build(deps): bump the k8s-io group with 1 update (kubeovn#3314)
3f2eeb9 
Bumps the k8s-io group with 1 update: [k8s.io/sample-controller](https://github.com/kubernetes/sample-controller).

- [Commits](kubernetes/sample-controller@v0.28.2...v0.28.3)

---
updated-dependencies:
- dependency-name: k8s.io/sample-controller
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@dependabot @zbb88888
build(deps): bump sigs.k8s.io/controller-runtime from 0.16.2 to 0.16.3 (
4068043 
kubeovn#3315)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.16.2 to 0.16.3.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.16.2...v0.16.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zhangzujian @zbb88888
fix golang lint error (kubeovn#3323)
b79c70a 
Signed-off-by: 张祖建 <zhangzujian.7@gmail.com>
@zbb88888
fix gofumpt
38d8843 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
@zbb88888 zbb88888 marked this pull request as ready for review October 23, 2023 08:39
@zbb88888 zbb88888 mentioned this pull request Oct 23, 2023
Merged
1 task
@zbb88888
ovn dnat should print vpc
47fd106 
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
oilbeater
oilbeater reviewed Oct 24, 2023
View reviewed changes
charts/templates/kube-ovn-crd.yaml Show resolved Hide resolved
cmd/cmdmain.go Show resolved Hide resolved
@zbb88888 zbb88888 merged commit 1606f3c into kubeovn:master Oct 24, 2023
@zbb88888 zbb88888 deleted the nat-reuse branch October 24, 2023 03:01
zbb88888 added a commit that referenced this pull request Oct 24, 2023
@zbb88888 @dependabot @zhangzujian
Nat reuse router port external ip (#3313)
b4abb34 
* nat could use lrp type ovn eip

* nat support specify vpc ip

* e2e

* fix G307

* update ovn nat webhook

* test e2e

* add independent vip e2e

* update ovn vpc nat e2e about nats use ip or ip cidr

* fix e2e

* fix golint

* fix comment

* build(deps): bump the k8s-io group with 1 update (#3314)

Bumps the k8s-io group with 1 update: [k8s.io/sample-controller](https://github.com/kubernetes/sample-controller).

- [Commits](kubernetes/sample-controller@v0.28.2...v0.28.3)

---
updated-dependencies:
- dependency-name: k8s.io/sample-controller
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>

* build(deps): bump sigs.k8s.io/controller-runtime from 0.16.2 to 0.16.3 (#3315)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.16.2 to 0.16.3.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.16.2...v0.16.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>

* fix golang lint error (#3323)

Signed-off-by: 张祖建 <zhangzujian.7@gmail.com>

* fix gofumpt

* ovn dnat should print vpc

---------

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: 张祖建 <zhangzujian.7@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 张祖建 <zhangzujian.7@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oilbeater oilbeater oilbeater approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zbb88888 @oilbeater @zhangzujian