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

[Windows] Prepare ovs bridge #564

Merged
merged 1 commit into from
Apr 27, 2020
Merged

[Windows] Prepare ovs bridge #564

merged 1 commit into from
Apr 27, 2020

Conversation

ruicao93
Copy link
Contributor

@ruicao93 ruicao93 commented Mar 30, 2020 •
edited
Loading

Depend on Wenyingd's PR: Enable Windows Pod to access external addresses #393

Add windows platform specific operations during OVS bridge preparation:

  1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
  2. Add default internal port/interface when creating OVS bridge.
    On windows platform OVS default inteface is used to forward host traffic.
  3. Move IP/MAC from uplink interface to OVS bridge.
  4. Add uplink port to OVS bridge.
  5. Install Openflow entries for uplink/bridge to support host networking.

@antrea-bot
Copy link
Collaborator

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

  • /test-e2e: to trigger e2e tests.
  • /skip-e2e: to skip e2e tests.
  • /test-conformance: to trigger conformance tests.
  • /skip-conformance: to skip conformance tests.
  • /test-networkpolicy: to trigger networkpolicy tests.
  • /skip-networkpolicy: to skip networkpolicy tests.
  • /test-all: to trigger all tests.
  • /skip-all: to skip all tests.

These commands can only be run by members of the vmware-tanzu organization.

@ruicao93 ruicao93 force-pushed the windows branch 2 times, most recently from cd58292 to df8780f Compare April 1, 2020 02:44
@wenyingd wenyingd mentioned this pull request Apr 1, 2020
Closed
21 tasks
wenyingd
wenyingd reviewed Apr 1, 2020
View reviewed changes
pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent_windows.go Show resolved Hide resolved
pkg/agent/openflow/client.go Outdated Show resolved Hide resolved
pkg/agent/openflow/client.go Outdated Show resolved Hide resolved
pkg/agent/util/net_windows.go Outdated Show resolved Hide resolved
@ruicao93 ruicao93 force-pushed the windows branch 6 times, most recently from f007902 to e8091ce Compare April 1, 2020 15:06
@ruicao93 ruicao93 requested review from jianjuns and tnqn April 1, 2020 15:10
@ruicao93
Copy link
Contributor Author

ruicao93 commented Apr 2, 2020

/test-all

@lzhecheng
Copy link
Contributor

/test-e2e
/test-conformance

jianjuns
jianjuns reviewed Apr 2, 2020
View reviewed changes
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
@wenyingd wenyingd force-pushed the windows branch 2 times, most recently from 8bcea70 to 12ad419 Compare April 8, 2020 07:09
@ruicao93 ruicao93 force-pushed the windows branch 5 times, most recently from 3335c22 to 6fe2ce5 Compare April 9, 2020 15:36
@ruicao93
Copy link
Contributor Author

ruicao93 commented Apr 9, 2020

/test-all

@ruicao93
Copy link
Contributor Author

/test-conformance

@ruicao93
Copy link
Contributor Author

/test-e2e

wenyingd
wenyingd reviewed Apr 21, 2020
View reviewed changes
Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

LGTM overall, except for some comments

pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
@ruicao93 ruicao93 force-pushed the windows branch 2 times, most recently from c5ebb1a to be0d8bc Compare April 21, 2020 14:22
wenyingd
wenyingd reviewed Apr 22, 2020
View reviewed changes
pkg/agent/agent.go Show resolved Hide resolved
pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
@ruicao93
Copy link
Contributor Author

/test-all

wenyingd
wenyingd approved these changes Apr 23, 2020
View reviewed changes
Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

LGTM.

pkg/agent/agent.go Show resolved Hide resolved
@ruicao93
Copy link
Contributor Author

ruicao93 commented Apr 23, 2020 •
edited
Loading

@jianjuns Could you help review the PR to check if there're any more advice?

jianjuns
jianjuns reviewed Apr 23, 2020
View reviewed changes
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

Sorry for the late review. Have a few more comments.

pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
pkg/agent/agent_windows.go Show resolved Hide resolved
pkg/agent/config/node_config.go
@@ -23,6 +23,7 @@ import (

const (
DefaultTunPortName = "tun0"
AutoAssignedOFPort = 0
Copy link
Contributor

Choose a reason for hiding this comment

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

This one should be defined in ovsconfig, but not here, as it is a predefined value in OVS.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, it's better to move the const to ovsconfig. Done.

And actually it's not a predefined value in OVS. We just use a invalid request port number as param and OVS will assign port number automatically.

@ruicao93
Copy link
Contributor Author

/test-all

@ruicao93 ruicao93 force-pushed the windows branch 2 times, most recently from 3e6d9b4 to fb1f44e Compare April 23, 2020 16:31
jianjuns
jianjuns reviewed Apr 23, 2020
View reviewed changes
pkg/agent/agent.go Show resolved Hide resolved
pkg/agent/agent_linux.go Outdated Show resolved Hide resolved
pkg/agent/agent_windows.go Outdated Show resolved Hide resolved
@ruicao93
Copy link
Contributor Author

/test-all

@ruicao93
Copy link
Contributor Author

/test-all

jianjuns
jianjuns reviewed Apr 26, 2020
View reviewed changes
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

LGTM.

pkg/agent/util/net_windows.go Outdated Show resolved Hide resolved
@ruicao93
[Windows] Prepare ovs bridge
079c249 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>
@ruicao93
Copy link
Contributor Author

/test-all

@ruicao93
Copy link
Contributor Author

/test-e2e

@ruicao93 ruicao93 merged commit 42e17d1 into antrea-io:windows Apr 27, 2020
ruicao93 added a commit to ruicao93/antrea that referenced this pull request May 27, 2020
@ruicao93
[Windows] Prepare ovs bridge (antrea-io#564)
4543c9c 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
ruicao93 added a commit that referenced this pull request May 27, 2020
@ruicao93
[Windows] Prepare ovs bridge (#564)
8bea4f9 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
McCodeman pushed a commit to McCodeman/antrea that referenced this pull request Jun 2, 2020
@ruicao93 @McCodeman
[Windows] Prepare ovs bridge (antrea-io#564)
23c920d 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
McCodeman pushed a commit that referenced this pull request Jun 2, 2020
@ruicao93 @McCodeman
[Windows] Prepare ovs bridge (#564)
7a9e2b6 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 22, 2020
@ruicao93 @GraysonWu
[Windows] Prepare ovs bridge (antrea-io#564)
acd5e5b 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 23, 2020
@ruicao93 @GraysonWu
[Windows] Prepare ovs bridge (antrea-io#564)
d75ca99 
Add windows platform specific operations during OVS bridge preparation:

1. Set fixed datapath_id for OVS bridge to avoid Openflow channel interruption.
2. Add default internal port/interface when creating OVS bridge.
  On windows platform OVS default inteface is used to forward host traffic.
3. Move IP/MAC from uplink interface to OVS bridge.
4. Add uplink port to OVS bridge.
5. Install Openflow entries for uplink/bridge to support host networking.

Signed-off-by: Rui Cao <rcao@vmware.com>

# Conflicts:
#	pkg/agent/agent.go
#	pkg/agent/config/node_config.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jianjuns jianjuns jianjuns left review comments

@wenyingd wenyingd wenyingd approved these changes

@tnqn tnqn Awaiting requested review from tnqn

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

Successfully merging this pull request may close these issues.
6 participants
@ruicao93 @antrea-bot @lzhecheng @wenyingd @jianjuns @vmwclabot