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 #3569: Fix reject loop issue and add error handling #3600

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Automated cherry pick of #3569: Fix reject loop issue and add error handling #3600

merged 2 commits into from
Apr 14, 2022

Conversation

GraysonWu
Copy link
Contributor

Cherry pick of #3569 on release-1.6.

#3569: Fix reject loop issue and add error handling

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

GraysonWu added 2 commits April 7, 2022 17:37
@GraysonWu
Fix reject loop issue and add error handling
6067fef 
Fixes antrea-io#3559
Skip the reject response generation when neither src nor dst are on
current Node.

Re-write the MAC address for `RejectPodLocal` reject type no matter
AntreaIPAM is on or not. And send the packetOut directly to the
dstPod instead of L3Forwarding table.

Signed-off-by: wgrayson <wgrayson@vmware.com>
@GraysonWu
Address comments
fd55aef 
Signed-off-by: wgrayson <wgrayson@vmware.com>
@GraysonWu GraysonWu 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 Apr 8, 2022
@GraysonWu GraysonWu requested review from antoninbas and tnqn and removed request for tnqn April 8, 2022 00:38
@tnqn
Copy link
Member

tnqn commented Apr 8, 2022

/test-all

@codecov-commenter
Copy link

codecov-commenter commented Apr 8, 2022 •
edited
Loading

Codecov Report

Merging #3600 (fd55aef) into release-1.6 (034a013) will increase coverage by 19.73%.
The diff coverage is 66.66%.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-1.6    #3600       +/-   ##
================================================
+ Coverage        43.39%   63.12%   +19.73%     
================================================
  Files              210      278       +68     
  Lines            25226    27841     +2615     
================================================
+ Hits             10948    17576     +6628     
+ Misses           13192     8377     -4815     
- Partials          1086     1888      +802
Flag Coverage Δ
kind-e2e-tests 49.64% <66.66%> (?)
unit-tests 43.34% <0.00%> (-0.06%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/agent/controller/networkpolicy/reject.go 85.82% <66.66%> (+85.82%) ⬆️
pkg/apiserver/certificate/certificate.go 69.44% <0.00%> (-6.95%) ⬇️
pkg/agent/cniserver/ipam/antrea_ipam.go 79.78% <0.00%> (-3.20%) ⬇️
pkg/controller/ipam/antrea_ipam_controller.go 74.13% <0.00%> (-1.73%) ⬇️
pkg/ipam/poolallocator/allocator.go 47.74% <0.00%> (-1.13%) ⬇️
pkg/apiserver/handlers/webhook/convert_crd.go 2.56% <0.00%> (ø)
pkg/apiserver/handlers/webhook/mutation_labels.go 24.71% <0.00%> (ø)
...rs/multicluster/resourceimportfilter_controller.go 0.00% <0.00%> (ø)
pkg/apis/crd/v1beta1/register.go 92.85% <0.00%> (ø)
pkg/ipfix/ipfix_registry.go 100.00% <0.00%> (ø)
... and 195 more

@GraysonWu
Copy link
Contributor Author

CI failed to init. Re-trigger it.
/test-e2e

@GraysonWu
Copy link
Contributor Author

/test-e2e

@GraysonWu
Copy link
Contributor Author

Seems jenkins e2e failed on the very last step retrieving the coverage file. http://10.176.27.169:8080/view/all/job/antrea-e2e-for-pull-request/662/ I think it's just a flake. It could be merged. @antoninbas @tnqn What do you think? Do you think we should give it another shot?

@tnqn
Copy link
Member

tnqn commented Apr 14, 2022

Seems jenkins e2e failed on the very last step retrieving the coverage file. http://10.176.27.169:8080/view/all/job/antrea-e2e-for-pull-request/662/ I think it's just a flake. It could be merged. @antoninbas @tnqn What do you think? Do you think we should give it another shot?

We could merge it. error retrieving the coverage file becomes more frequently, @antoninbas has #3607 fixing it.

@tnqn
Copy link
Member

tnqn commented Apr 14, 2022

/skip-e2e

@tnqn tnqn merged commit f3208e7 into antrea-io:release-1.6 Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoninbas antoninbas antoninbas approved these changes

@tnqn tnqn tnqn approved these changes

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.
4 participants
@GraysonWu @tnqn @codecov-commenter @antoninbas