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

Automated cherry pick of #6763: Install Pod flows after PortStatus message is#6889: Support OF port state "down" when installing Pod... #6937

Merged
merged 4 commits into from
Jan 28, 2025
Merged

Automated cherry pick of #6763: Install Pod flows after PortStatus message is#6889: Support OF port state "down" when installing Pod... #6937

merged 4 commits into from
Jan 28, 2025
+1,179 −186

Conversation

wenyingd
Copy link
Contributor

@wenyingd wenyingd commented Jan 17, 2025 •
edited
Loading

Cherry pick of #6763 #6889 #6751 #6528 on release-2.1.

#6763: Install Pod flows after PortStatus message is
#6889: Support OF port state "down" when installing Pod
#6751: Update Jenkins Scripts for Testbed Migration
#6528: Match dstIP in Classifier to address windows promiscuous mode issue

For details on the cherry pick process, see the cherry pick requests page.

@wenyingd wenyingd added the kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release label Jan 17, 2025
@wenyingd
Copy link
Contributor Author

/test-windows-all

@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch 7 times, most recently from 2a9ca24 to 85927f1 Compare January 17, 2025 08:57
@wenyingd
Copy link
Contributor Author

/test-windows-all

@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch from 85927f1 to b9e5014 Compare January 20, 2025 03:06
@XinShuYang
Copy link
Contributor

/test-windows-all

@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch from b9e5014 to 881fea9 Compare January 20, 2025 06:56
@wenyingd
Copy link
Contributor Author

/test-windows-all

1 similar comment
@XinShuYang
Copy link
Contributor

/test-windows-all

@XinShuYang
Copy link
Contributor

/test-windows-e2e

@wenyingd
Copy link
Contributor Author

/test-windows-all

2 similar comments
@XinShuYang
Copy link
Contributor

/test-windows-all

@XinShuYang
Copy link
Contributor

/test-windows-all

XinShuYang
XinShuYang reviewed Jan 22, 2025
View reviewed changes
ci/jenkins/test.sh
e2e_images=("toolbox:1.3-0")
k8s_images=("registry.k8s.io/e2e-test-images/agnhost:2.52" "registry.k8s.io/e2e-test-images/jessie-dnsutils:1.5" "registry.k8s.io/e2e-test-images/nginx:1.14-2" "registry.k8s.io/pause:3.10")
conformance_images=("k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.52" "k8sprow.azurecr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.5" "k8sprow.azurecr.io/kubernetes-e2e-test-images/nginx:1.14-2" "registry.k8s.io/e2e-test-images/pause:3.10")
e2e_images=("${DOCKER_REGISTRY}/antrea/toolbox:1.4-0" "registry.k8s.io/e2e-test-images/agnhost:2.40")
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the toolbox version in the 2.1 branch should be 1.3-0; otherwise, there could be flaky failures in the e2e tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this comment still relevant?

Copy link
Contributor

Choose a reason for hiding this comment

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

@antoninbas Wenying may not be available to update this PR recently. I think we can ignore it for now and merge this PR first to restore the CI. If there is an issue with this image version, I can create another PR to fix it in time.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok

@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch from 881fea9 to 54ec651 Compare January 22, 2025 07:22
@XinShuYang
Copy link
Contributor

/test-windows-all

@antoninbas
Copy link
Contributor

conflicts need to be resolved, presumably because of #6930

is there anything that should be highlighted for that PR? I see changes in ci/jenkins/test-vm.sh, which don't seem to be coming from any of the 2 PRs being cherry-picked.

@XinShuYang
Copy link
Contributor

conflicts need to be resolved, presumably because of #6930

is there anything that should be highlighted for that PR? I see changes in ci/jenkins/test-vm.sh, which don't seem to be coming from any of the 2 PRs being cherry-picked.

Hi @antoninbas , changes in ci/jenkins/test-vm.sh came from #6932. We updated both windows and external nodes CI scripts in this PR after the testbed migration.

@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch 2 times, most recently from ce635e7 to 8133f3c Compare January 23, 2025 02:46
wenyingd and others added 4 commits January 23, 2025 02:53
@wenyingd
Install Pod flows after PortStatus message is received (antrea-io#6763)
b9b4e5f 
This change introduces a worker in `podConfigurator` to listen for the
OpenFlow PortStatus messages generated when new OpenFlow ports are allocated
in OVS. After receiving a message, the Windows antrea-agent will install Pod-related
OpenFlow entries. If the OpenFlow port is not allocated within 30s after the CmdAdd
request is handled, a K8s event with type "NetworkNotReady" is added on the Pod.
Whenever the Pod networking forwarding rules are installed, a K8s event with type
"NetworkIsReady" is added.

Signed-off-by: Wenying Dong <wenyingd@vmware.com>
@wenyingd
[Windows] Support OF port state "down" when installing Pod forwarding…
076894d 
… rules (antrea-io#6889)

On Windows, OVS has an issue which doesn't correctly update the port status
after an OpenFlow port is successfully installed. So OVS may send out PortStatus
message with Port state as LIND_DOWN, this issue doesn't impact on the datapath
forwarding.

This change is a workaround to ensure Pod's OpenFlow entries are installed as
long as the OpenFlow port is allocated.

Signed-off-by: Wenying Dong <wenyingd@vmware.com>
@XinShuYang @wenyingd
Update Jenkins Scripts for Testbed Migration (antrea-io#6751)
85c9631 
* Upgraded Windows images to restore CI on the latest kubernetes cluster
* Updated external node e2e test and jenkins script for testbed migration.

Signed-off-by: Gavin Xin <gavinx@vmware.com>
@XinShuYang @wenyingd
Match dstIP in Classifier to address windows promiscuous mode issue (a…
8f08909 
…ntrea-io#6528)

When promiscuous mode is enabled, OVS incorrectly forwards packets destined for
non-local IP addresses from the uplink to the host interface. Due to IP forwarding
being enabled, these packets are re-sent to br-int according to the default route
and are eventually forwarded to the uplink. Since the source MAC of these packets
has been changed to the local host’s MAC, this can potentially cause errors on the switch.

This patch matches dstIP field in ClassifierTable to ensure proper packet handling
and preventing unintended forwarding.

Signed-off-by: Gavin Xin <gavinx@vmware.com>
@wenyingd wenyingd force-pushed the automated-cherry-pick-of-#6763-#6889-upstream-release-2.1 branch from 8133f3c to 8f08909 Compare January 23, 2025 02:53
@wenyingd
Copy link
Contributor Author

/test-windows-all
/test-all

@XinShuYang
Copy link
Contributor

/test-windows-networkpolicy

XinShuYang
XinShuYang approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@XinShuYang XinShuYang left a comment

Choose a reason for hiding this comment

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

LGTM

@antoninbas
Copy link
Contributor

conflicts need to be resolved, presumably because of #6930
is there anything that should be highlighted for that PR? I see changes in ci/jenkins/test-vm.sh, which don't seem to be coming from any of the 2 PRs being cherry-picked.

Hi @antoninbas , changes in ci/jenkins/test-vm.sh came from #6932. We updated both windows and external nodes CI scripts in this PR after the testbed migration.

Got it, so we just need to merge #6932 first

@wenyingd
Copy link
Contributor Author

/test-networkpolicy

@wenyingd wenyingd changed the title Automated cherry pick of #6763: Install Pod flows after PortStatus message is #6889: Support OF port state "down" when installing Pod Automated cherry pick of #6763: Install Pod flows after PortStatus message is#6889: Support OF port state "down" when installing Pod... Jan 24, 2025
@XinShuYang
Copy link
Contributor

conflicts need to be resolved, presumably because of #6930
is there anything that should be highlighted for that PR? I see changes in ci/jenkins/test-vm.sh, which don't seem to be coming from any of the 2 PRs being cherry-picked.

Hi @antoninbas , changes in ci/jenkins/test-vm.sh came from #6932. We updated both windows and external nodes CI scripts in this PR after the testbed migration.

Got it, so we just need to merge #6932 first

@antoninbas Can we merge this PR, which includes all four patches we need to restore Windows CI for 2.1 branch? Since the lack of any patch can cause flaky failures, the CI jobs you triggered in #6932 cannot pass. If we merge this PR, we also won't need to resolve conflicts one by one in separate backport PRs.

@antoninbas
Copy link
Contributor

@XinShuYang yes, now that the PR has been updated to properly cherry-pick all 4 independent patches, I think we can just merge this one

@antoninbas antoninbas merged commit 7097d45 into antrea-io:release-2.1 Jan 28, 2025
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XinShuYang XinShuYang XinShuYang approved these changes

@antoninbas antoninbas Awaiting requested review from antoninbas

@luolanzone luolanzone Awaiting requested review from luolanzone

Assignees
No one assigned
Labels
kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wenyingd @XinShuYang @antoninbas