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 calico-node template and remove flexvol-driver initContainer #11634

Merged

Conversation

KubeKyrie
Copy link
Contributor

@KubeKyrie KubeKyrie commented Oct 15, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

update calico-nopde template and remove flexvol-driver initContainer, for calico has abandon it.

See https://github.com/projectcalico/calico/blob/v3.28.1/manifests/calico.yaml#L4757

The calico-node.yml template file has not been updated and it should follow calico version(currently v3.28.1).

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:
link projectcalico/calico#9338

Does this PR introduce a user-facing change?:

Update calico-nopde template and remove flexvol-driver initContainer

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 15, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @KubeKyrie. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 15, 2024
@KubeKyrie KubeKyrie force-pushed the update-calico-template branch from f7afc1d to 53fe3f7 Compare October 15, 2024 15:31
@yankay
Copy link
Member

yankay commented Oct 16, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 16, 2024
@KubeKyrie KubeKyrie force-pushed the update-calico-template branch from 53fe3f7 to dcd2635 Compare October 17, 2024 15:39
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 17, 2024
@KubeKyrie KubeKyrie changed the title update calico-node template [WIP]update calico-node template Oct 18, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2024
@KubeKyrie KubeKyrie force-pushed the update-calico-template branch 3 times, most recently from ef9df92 to a8f9078 Compare October 20, 2024 15:02
Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io>
@KubeKyrie KubeKyrie force-pushed the update-calico-template branch from a8f9078 to 29ffe8a Compare October 20, 2024 15:19
@KubeKyrie
Copy link
Contributor Author

Test results:

image

@KubeKyrie
Copy link
Contributor Author

@tico88612 @VannTen Could you help review it ? Thanks.

@KubeKyrie KubeKyrie changed the title [WIP]update calico-node template update calico-node template Oct 21, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 21, 2024
@tico88612
Copy link
Member

I think this should be a bug fix for v3.28.1, not a new feature. (because we didn't follow upstream before this PR)

/remove-kind feature
/kind bug
/retitle Fix calico-node template and remove flexvol-driver initContainer
/release-note-edit

Fix calico-node template and remove flexvol-driver initContainer

@k8s-ci-robot k8s-ci-robot changed the title update calico-node template Fix calico-node template and remove flexvol-driver initContainer Oct 21, 2024
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed kind/feature Categorizes issue or PR as related to a new feature. labels Oct 21, 2024
@yankay
Copy link
Member

yankay commented Oct 24, 2024

HI @cyclinder
Would you please help to review it.

Copy link
Contributor

@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.

Thanks, I have already discussed the changes in this PR with @KubeKyrie , and the code looks good.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2024
Copy link
Member

@tico88612 tico88612 left a comment

Choose a reason for hiding this comment

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

/lgtm

@KubeKyrie
Copy link
Contributor Author

@yankay Hi, kay, could you help give an approve to merge it?

Thanks.

@yankay
Copy link
Member

yankay commented Oct 31, 2024

Thanks @KubeKyrie
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cyclinder, KubeKyrie, tico88612, yankay

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 31, 2024
@k8s-ci-robot k8s-ci-robot merged commit d0f1d52 into kubernetes-sigs:master Oct 31, 2024
40 checks passed
@tico88612
Copy link
Member

/cherry-pick release-2.26

@k8s-infra-cherrypick-robot

@tico88612: new pull request created: #11676

In response to this:

/cherry-pick release-2.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

kpoxo6op pushed a commit to kpoxo6op/kubespray that referenced this pull request Dec 27, 2024
Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants