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

enable coordinate to support serviceCIDR according to a matched k8s version. #3168

Merged
merged 1 commit into from
Feb 3, 2024

Conversation

ty-dc
Copy link
Collaborator

@ty-dc ty-dc commented Jan 31, 2024

Thanks for contributing!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #3163

Special notes for your reviewer:

@ty-dc
Copy link
Collaborator Author

ty-dc commented Jan 31, 2024

在 PR #3132 中对 MultiCIDRService 功能进行了适配。但该功能门是在 kubernetes 1.27 版本引入的,1.29 版本 GA。故在 1.27 之前的版本中,该功能并不可用,开启该功能将导致多矩阵的 K8s(低于 1.27.0 的) 运行 setup kind cluster 失败。对此做了适配。如果 kubernetes 版本是 1.29 及以上的版本,才开启该功能并运行对应 e2e。

/cc @cyclinder please help review it.

@@ -18,7 +18,3 @@ kubeadmConfigPatches:
nodes:
- role: control-plane
- role: worker
featureGates:
"MultiCIDRServiceAllocator": true
Copy link
Collaborator

Choose a reason for hiding this comment

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

可以这样 {"AllAlpha":true}

Copy link
Collaborator

Choose a reason for hiding this comment

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

然后上面 makefile 就不用动了

Copy link
Collaborator

@cyclinder cyclinder left a comment

Choose a reason for hiding this comment

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

我担心以后要是还有别的feature-gate 添加,会导致 makefile 变得无比冗长

@@ -18,7 +18,3 @@ kubeadmConfigPatches:
nodes:
- role: control-plane
- role: worker
featureGates:
"MultiCIDRServiceAllocator": true
Copy link
Collaborator

Choose a reason for hiding this comment

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

然后上面 makefile 就不用动了

@ty-dc ty-dc added the pr/not-ready not ready for merging label Jan 31, 2024
@ty-dc
Copy link
Collaborator Author

ty-dc commented Jan 31, 2024

/hold 仍需要更多测试

@ty-dc ty-dc force-pushed the k8s-fix branch 4 times, most recently from 6c31a5b to 974a76d Compare February 2, 2024 06:53
@ty-dc ty-dc removed the pr/not-ready not ready for merging label Feb 2, 2024
@ty-dc
Copy link
Collaborator Author

ty-dc commented Feb 2, 2024

For any further help, visit https://docs.cilium.io/en/v1.15/gettinghelp
make[2]: *** [Makefile:37: kind-init] Terminated
make[1]: *** [Makefile:297: e2e_init] Terminated
make: *** [Makefile:333: e2e_init_cilium] Terminated

Copy link

codecov bot commented Feb 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (439e693) 81.68% compared to head (d4e2fe8) 81.12%.
Report is 2 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3168      +/-   ##
==========================================
- Coverage   81.68%   81.12%   -0.56%     
==========================================
  Files          50       50              
  Lines        5373     5373              
==========================================
- Hits         4389     4359      -30     
- Misses        823      856      +33     
+ Partials      161      158       -3     
Flag Coverage Δ
unittests 81.12% <ø> (-0.56%) ⬇️

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

see 1 file with indirect coverage changes

@ty-dc
Copy link
Collaborator Author

ty-dc commented Feb 2, 2024

fix #3180

@ty-dc
Copy link
Collaborator Author

ty-dc commented Feb 2, 2024

@Icarus9913
Copy link
Collaborator

给cilium先回退一个版本
--version 1.14.0

@ty-dc
Copy link
Collaborator Author

ty-dc commented Feb 3, 2024

在 IPv6 模式下,v 1.15.0 版本的 cilium Pod 报错。

level=fatal msg="auto-direct-node-routes cannot be used with tunneling. Packets must be routed through the tunnel device." subsys=daemon

查看文档 https://docs.cilium.io/en/stable/network/concepts/routing/ 暂时做修改。

--set routingMode=native "

@weizhoublue
Copy link
Collaborator

weizhoublue commented Feb 3, 2024

from the PR title, there is no idea what it is
if this is bug, please update the PR title to make it clear for the release note

@weizhoublue weizhoublue changed the title The feature gate function is only enabled in the corresponding version. enable coordinate to support serviceCIDR according to a matched k8s version. Feb 3, 2024
@weizhoublue weizhoublue merged commit acceb8e into spidernet-io:main Feb 3, 2024
42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nightly K8s Matrix CI 2024-01-30: Failed
4 participants