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

Fix run on aws ec2 with cilium #1431

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Fix run on aws ec2 with cilium #1431

merged 1 commit into from
Aug 16, 2024

Conversation

lou-lan
Copy link
Collaborator

@lou-lan lou-lan commented Aug 7, 2024

Fix #1424

vxlan

Fix detect vxlan parent IP logic not skip IP addresses with a full subnet mask (e.g., /32 for IPv4 and /128 for IPv6).
On AWS, when main network card has multiple IP, and it is set to default route.

if ones == 32 && bits == 32 || ones == 128 && bits == 128 {
        continue
}

iptables

Add more iptabels accept rule skip cilium rule.

EgressClusterInfo

Add kube-controller-manager labels case, We use these labels to retrieve the kube-controller-manager Pod arguments in order to obtain the cluster CIDR. Since different clusters have different kube-controller-manager labels, the content of the labels also varies.

If not found CalicoIPPool CRD in current cluster, skipping watch CalicoIPPool.

@lou-lan lou-lan requested a review from weizhoublue as a code owner August 7, 2024 09:40
@lou-lan lou-lan changed the title Fix get vxlan parent IP logic to skip IP addresses with a full subnet… Fix get vxlan parent IP logic to skip IP addresses. Aug 7, 2024
@lou-lan lou-lan added the release/bug bug pr recoded in new release label Aug 7, 2024
@lou-lan lou-lan changed the title Fix get vxlan parent IP logic to skip IP addresses. Fix get vxlan parent IP logic to skip IP addresses Aug 7, 2024
@lou-lan lou-lan changed the title Fix get vxlan parent IP logic to skip IP addresses Fix get vxlan parent IP logic got wrong IP addresses Aug 7, 2024
@lou-lan lou-lan changed the title Fix get vxlan parent IP logic got wrong IP addresses Fix detect vxlan parent IP logic got wrong IP addresses Aug 7, 2024
@lou-lan lou-lan changed the title Fix detect vxlan parent IP logic got wrong IP addresses Fix detect vxlan parent IP logic got wrong IP addresses and accept and add more accept rule for cilium Aug 7, 2024
Copy link

codecov bot commented Aug 7, 2024

Codecov Report

Attention: Patch coverage is 33.33333% with 2 lines in your changes missing coverage. Please review.

Project coverage is 82.90%. Comparing base (461c688) to head (bf30c3e).
Report is 2 commits behind head on main.

Files Patch % Lines
pkg/agent/vxlan/parent.go 33.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1431      +/-   ##
==========================================
- Coverage   83.05%   82.90%   -0.16%     
==========================================
  Files          19       19              
  Lines        2278     2281       +3     
==========================================
- Hits         1892     1891       -1     
- Misses        276      278       +2     
- Partials      110      112       +2     
Flag Coverage Δ
unittests 82.90% <33.33%> (-0.16%) ⬇️

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

Files Coverage Δ
pkg/agent/vxlan/parent.go 95.74% <33.33%> (-4.26%) ⬇️

... and 1 file with indirect coverage changes

pkg/agent/police.go Outdated Show resolved Hide resolved
@lou-lan lou-lan force-pushed the fix-vxlan branch 2 times, most recently from 4f11858 to c83e03d Compare August 8, 2024 06:09
@lou-lan lou-lan changed the title Fix detect vxlan parent IP logic got wrong IP addresses and accept and add more accept rule for cilium Fix run on aws ec2 Aug 8, 2024
@lou-lan lou-lan changed the title Fix run on aws ec2 Fix run on aws ec2 with cilium Aug 8, 2024
@lou-lan lou-lan force-pushed the fix-vxlan branch 2 times, most recently from d0b56e9 to 5f8b61f Compare August 8, 2024 07:44
@weizhoublue weizhoublue temporarily deployed to commit August 8, 2024 07:45 Inactive
@weizhoublue
Copy link
Collaborator

weizhoublue commented Aug 8, 2024

@weizhoublue weizhoublue temporarily deployed to pull request August 8, 2024 07:45 Inactive
… mask (e.g., /32 for IPv4 and /128 for IPv6).

Signed-off-by: lou-lan <[email protected]>
@weizhoublue weizhoublue temporarily deployed to pull request August 8, 2024 07:45 Inactive
@weizhoublue weizhoublue temporarily deployed to commit August 8, 2024 07:45 Inactive
@weizhoublue weizhoublue merged commit c964c3e into main Aug 16, 2024
39 checks passed
@weizhoublue weizhoublue deleted the fix-vxlan branch August 16, 2024 04:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release/bug bug pr recoded in new release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AWS Test
2 participants