-
Notifications
You must be signed in to change notification settings - Fork 812
1、支持Rocky9.7/Rocky10.1;2、支持k8s-v1.34.x #2913
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
Conversation
Signed-off-by: CYS158 <[email protected]>
Summary of ChangesHello @CYS158, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! 此拉取请求旨在通过增加对Rocky Linux 9.7和10.1操作系统的兼容性,以及引入对Kubernetes v1.34.x版本的支持,来扩展系统的部署灵活性和兼容性。这些更改确保了用户可以在更广泛的环境中部署和管理Kubernetes集群。 Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
这个 PR 增加了对 Rocky Linux 的支持,并为未来的 Kubernetes v1.34.x 版本添加了新的配置文件。整体来看,变更主要是添加了新的配置。我发现了一些问题,包括使用了不存在的组件版本,以及在一个配置文件中存在硬编码版本号导致的可维护性问题。请查看具体的审查意见。
| tag: 2.9.6-alpine | ||
| etcd: | ||
| # etcd binary | ||
| etcd_version: v3.5.25 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| tag: "3.9" | ||
| # ========== cri ========== | ||
| # crictl binary | ||
| crictl_version: v1.33.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| tag: 2.9.6-alpine | ||
| etcd: | ||
| # etcd binary | ||
| etcd_version: v3.5.25 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| tag: "3.9" | ||
| # ========== cri ========== | ||
| # crictl binary | ||
| crictl_version: v1.33.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| - docker.io/calico/apiserver:v3.28.2 | ||
| - docker.io/calico/cni:v3.28.2 | ||
| - docker.io/calico/ctl:v3.28.2 | ||
| - docker.io/calico/csi:v3.28.2 | ||
| - docker.io/calico/kube-controllers:v3.28.2 | ||
| - docker.io/calico/node-driver-registrar:v3.28.2 | ||
| - docker.io/calico/node:v3.28.2 | ||
| - docker.io/calico/pod2daemon-flexvol:v3.28.2 | ||
| - docker.io/calico/typha:v3.28.2 | ||
| - docker.io/kubesphere/coredns:v1.12.1 | ||
| - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 | ||
| - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} | ||
| - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} | ||
| - docker.io/kubesphere/kube-proxy:{{ .kube_version }} | ||
| - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} | ||
| - docker.io/kubesphere/pause:3.9 | ||
| - docker.io/openebs/linux-utils:4.2.0 | ||
| - docker.io/openebs/provisioner-localpv:4.2.0 | ||
| - quay.io/tigera/operator:v1.34.5 | ||
| - docker.io/library/haproxy:2.9.6-alpine | ||
| - docker.io/plndr/kube-vip:v0.7.2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
image_manifests 中的镜像版本是硬编码的,而这些版本已在此文件的上文中定义为变量。这可能导致不一致和维护困难。为了提高可维护性,建议使用模板变量来引用这些版本,类似于 builtin/core/roles/defaults/vars/v1.34.yaml 文件中的做法。
- docker.io/calico/apiserver:{{ .cni.calico_version }}
- docker.io/calico/cni:{{ .cni.calico_version }}
- docker.io/calico/ctl:{{ .cni.calico_version }}
- docker.io/calico/csi:{{ .cni.calico_version }}
- docker.io/calico/kube-controllers:{{ .cni.calico_version }}
- docker.io/calico/node-driver-registrar:{{ .cni.calico_version }}
- docker.io/calico/node:{{ .cni.calico_version }}
- docker.io/calico/pod2daemon-flexvol:{{ .cni.calico_version }}
- docker.io/calico/typha:{{ .cni.calico_version }}
- docker.io/kubesphere/coredns:{{ .dns.dns_image.tag }}
- docker.io/kubesphere/k8s-dns-node-cache:{{ .dns.dns_cache_image.tag }}
- docker.io/kubesphere/kube-apiserver:{{ .kube_version }}
- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }}
- docker.io/kubesphere/kube-proxy:{{ .kube_version }}
- docker.io/kubesphere/kube-scheduler:{{ .kube_version }}
- docker.io/kubesphere/pause:{{ .cri.sandbox_image.tag }}
- docker.io/openebs/linux-utils:{{ .storage_class.local.linux_utils_image.tag }}
- docker.io/openebs/provisioner-localpv:{{ .storage_class.local.provisioner_image.tag }}
- quay.io/tigera/operator:v1.34.5
- docker.io/library/haproxy:{{ .kubernetes.control_plane_endpoint.haproxy.image.tag }}
- docker.io/plndr/kube-vip:{{ .kubernetes.control_plane_endpoint.kube_vip.image.tag }}|
/approve |
|
LGTM label has been added. DetailsGit tree hash: 4e33d883b124d2b8b8a3c74f95e65ecaa189e0d9 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CYS158, redscholar The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |



What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for reviewers:
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: