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 cleanup kmesh-cni failed bug #367

Merged
merged 2 commits into from
May 27, 2024
Merged

Conversation

bfforever
Copy link
Member

@bfforever bfforever commented May 27, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fix cleanup kmesh-cni failed bug.

Which issue(s) this PR fixes:
Fixes #365

Special notes for your reviewer:

Does this PR introduce a user-facing change?:


Signed-off-by: kangmingfa <1640528278@qq.com>
@kmesh-bot kmesh-bot added the kind/bug Something isn't working label May 27, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 27, 2024

Codecov Report

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

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Flag Coverage Δ
unittests 31.67% <0.00%> (?)

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

Files Coverage Δ
pkg/cni/chained.go 38.25% <0.00%> (ø)
pkg/cni/install.go 20.00% <0.00%> (ø)

@@ -80,7 +80,7 @@ func (i *Installer) Stop() {
if i.Mode == constants.AdsMode || i.Mode == constants.WorkloadMode {
log.Info("start remove CNI config\n")
if err := i.removeCniConfig(); err != nil {
log.Error("remove CNI config failed, please remove manual")
log.Errorf("err:%v, remove CNI config failed, please remove manual", err)
Copy link
Collaborator

Choose a reason for hiding this comment

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

In line 81 of the log, a newline character was added. Does it need to be added here? What is the standard for adding or not adding newline characters in Kmesh logs?

Copy link
Member

Choose a reason for hiding this comment

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

we donot need to add \n by hand, becasue log.Errorf/Info/Debug has also added \n implicitly

@@ -80,7 +80,7 @@ func (i *Installer) Stop() {
if i.Mode == constants.AdsMode || i.Mode == constants.WorkloadMode {
log.Info("start remove CNI config\n")
if err := i.removeCniConfig(); err != nil {
log.Error("remove CNI config failed, please remove manual")
log.Errorf("err:%v, remove CNI config failed, please remove manual", err)
Copy link
Member

Choose a reason for hiding this comment

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

we donot need to add \n by hand, becasue log.Errorf/Info/Debug has also added \n implicitly

Co-authored-by: Tiger Xu / Zhonghu Xu <xuzhonghu@huawei.com>
@hzxuzhonghu
Copy link
Member

/lgtm

/approve

@kmesh-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hzxuzhonghu

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

@kmesh-bot kmesh-bot merged commit 8af5f1a into kmesh-net:main May 27, 2024
3 checks passed
@bfforever bfforever deleted the kmesh-bugfix branch June 5, 2024 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kmesh-cni and kmesh-cni-kubeconfig remove failed when uninstall kmesh
5 participants