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.

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

Support configurable tunnel port for TrafficEncapMode #4065

Merged
merged 1 commit into from
Aug 9, 2022

Conversation

Jexf
Copy link
Member

@Jexf Jexf commented Aug 1, 2022

This PR supports configurable tunnel port for TrafficEncapMode. When
deployed on the public cloud, the tunnel type and tunnel port used by
the underlying network may be the same as the antrea container network,
so it needs to support the modification of the tunnel port to prevent
conflicts.

Signed-off-by: Wu zhengdong zhengdong.wu@transwarp.io

@codecov
Copy link

codecov bot commented Aug 1, 2022

Codecov Report

Merging #4065 (887215a) into main (98967d7) will increase coverage by 6.69%.
The diff coverage is 70.83%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4065      +/-   ##
==========================================
+ Coverage   61.09%   67.78%   +6.69%     
==========================================
  Files         294      297       +3     
  Lines       44315    44957     +642     
==========================================
+ Hits        27073    30474    +3401     
+ Misses      14950    12131    -2819     
- Partials     2292     2352      +60     
Flag Coverage Δ
e2e-tests 40.72% <70.83%> (?)
integration-tests 35.45% <0.00%> (?)
kind-e2e-tests 50.82% <70.83%> (+7.19%) ⬆️
unit-tests 44.33% <0.00%> (+0.05%) ⬆️
Impacted Files Coverage Δ
pkg/agent/config/node_config.go 100.00% <ø> (ø)
pkg/ovs/ovsconfig/ovs_client.go 68.17% <42.85%> (+22.41%) ⬆️
pkg/agent/agent.go 57.79% <62.50%> (+4.92%) ⬆️
...gent/controller/noderoute/node_route_controller.go 61.82% <100.00%> (+2.80%) ⬆️
pkg/agent/interfacestore/types.go 77.77% <100.00%> (+16.66%) ⬆️
.../flowexporter/connections/conntrack_connections.go 66.66% <0.00%> (-8.58%) ⬇️
pkg/ovs/openflow/ofctrl_packetin.go 66.66% <0.00%> (-2.96%) ⬇️
...ntroller/networkpolicy/networkpolicy_controller.go 80.14% <0.00%> (-2.19%) ⬇️
pkg/apis/controlplane/sets.go 27.90% <0.00%> (-1.21%) ⬇️
...lowaggregator/clickhouseclient/clickhouseclient.go 81.86% <0.00%> (-1.13%) ⬇️
... and 99 more

build/yamls/antrea.yml Outdated Show resolved Hide resolved
build/charts/antrea/values.yaml Outdated Show resolved Hide resolved
pkg/agent/interfacestore/types.go Outdated Show resolved Hide resolved
pkg/config/agent/config.go Outdated Show resolved Hide resolved
pkg/ovs/ovsconfig/ovs_client.go Outdated Show resolved Hide resolved
@Jexf Jexf force-pushed the tunnel-port branch 2 times, most recently from 9262fc1 to 3ccdf64 Compare August 2, 2022 02:32
pkg/agent/agent.go Show resolved Hide resolved
cmd/antrea-agent/agent.go Outdated Show resolved Hide resolved
test/integration/ovs/ovs_client_test.go Outdated Show resolved Hide resolved
@Jexf Jexf force-pushed the tunnel-port branch 4 times, most recently from af64ec4 to f1563a2 Compare August 4, 2022 03:23
build/charts/antrea/values.yaml Outdated Show resolved Hide resolved
build/yamls/antrea-windows.yml Outdated Show resolved Hide resolved
pkg/agent/agent.go Outdated Show resolved Hide resolved
test/integration/ovs/ovs_client_test.go Outdated Show resolved Hide resolved
test/integration/ovs/ovs_client_test.go Outdated Show resolved Hide resolved
test/integration/ovs/ovs_client_test.go Outdated Show resolved Hide resolved
This PR supports configurable tunnel port for TrafficEncapMode. When
deployed on the public cloud, the tunnel type and tunnel port used by
the underlying network may be the same as the antrea container network,
so it needs to support the modification of the tunnel port to prevent
conflicts.

Signed-off-by: Wu zhengdong <zhengdong.wu@transwarp.io>
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@tnqn
Copy link
Member

tnqn commented Aug 9, 2022

/test-all

@tnqn tnqn added this to the Antrea v1.8 release milestone Aug 9, 2022
@tnqn tnqn added the action/release-note Indicates a PR that should be included in release notes. label Aug 9, 2022
@tnqn tnqn merged commit 8446156 into antrea-io:main Aug 9, 2022
ceclinux pushed a commit to ceclinux/antrea that referenced this pull request Sep 20, 2022
This PR supports configurable tunnel port for TrafficEncapMode. When
deployed on the public cloud, the tunnel type and tunnel port used by
the underlying network may be the same as the antrea container network,
so it needs to support the modification of the tunnel port to prevent
conflicts.

Signed-off-by: Wu zhengdong <zhengdong.wu@transwarp.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/release-note Indicates a PR that should be included in release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants