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

Spidercoordinator: It able to get CIDR from kubeadm-config #3130

Merged
merged 1 commit into from
Jan 25, 2024

Conversation

cyclinder
Copy link
Collaborator

If the kube-controller-manager Pod is running as systemd precess rather than Pod, In this case, We can't get the CIDR from the KCM Pod. We can get the CIDR from the kubeadm-config configMap.

Thanks for contributing!

What type of PR is this?

What this PR does / why we need it:

Cherry-pick

Which issue(s) this PR fixes:

Fixes #3126

Special notes for your reviewer:

Copy link

codecov bot commented Jan 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (1c306e4) 81.01% compared to head (f3ad24b) 81.01%.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##           release-v0.8    #3130   +/-   ##
=============================================
  Coverage         81.01%   81.01%           
=============================================
  Files                49       49           
  Lines              5340     5340           
=============================================
  Hits               4326     4326           
  Misses              856      856           
  Partials            158      158           
Flag Coverage Δ
unittests 81.01% <ø> (ø)

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

@ty-dc
Copy link
Collaborator

ty-dc commented Jan 24, 2024

CI 失败的原因:

release-0.8 的 e2e 安装的 IPv6 单栈集群的 calico 有 bug,它仍有 IPV4、IPv6 的池。故在 IPv6 的集群中 auto 模式下仍获取到了 ipv4 的 pod CIDR。

将 release-0.8 的 test/scripts/install-default-cni.sh 中 151 行修改一下?保证 ipv6 模式下只有calico 的 ipv6 池?

      ipv6)
        kubectl delete ippools default-ipv4-ippool --force
        kubectl patch ippools default-ipv6-ippool --patch '{"spec": {"cidr": "'"${CALICO_IPV6POOL_CIDR}"'"}}' --type=merge
        ;;

@weizhoublue weizhoublue added release/bug and removed release/none no release note labels Jan 25, 2024
@weizhoublue
Copy link
Collaborator

[FAIL] SpiderCoordinator Switch podCIDRType to calico or ciliumnone

https://github.com/spidernet-io/spiderpool/actions/runs/7638721733/job/20818914107?pr=3130

@cyclinder
Copy link
Collaborator Author

why can't merge this when we have two approves?

@cyclinder
Copy link
Collaborator Author

The base branch requires all commits to be signed

If the kube-controller-manager Pod is running as systemd precess rather than Pod, In this case, We can't get the CIDR from the KCM Pod. We can get the CIDR from the kubeadm-config configMap.

Signed-off-by: cyclinder <qifeng.guo@daocloud.io>
@cyclinder cyclinder merged commit bb079d0 into spidernet-io:release-v0.8 Jan 25, 2024
1 check 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.

None yet

3 participants