Skip to content

waypoint should not managed by Kmesh#611

Merged
kmesh-bot merged 1 commit intokmesh-net:mainfrom
LiZhenCheng9527:metric-bug-fix
Jul 19, 2024
Merged

waypoint should not managed by Kmesh#611
kmesh-bot merged 1 commit intokmesh-net:mainfrom
LiZhenCheng9527:metric-bug-fix

Conversation

@LiZhenCheng9527
Copy link
Copy Markdown
Contributor

@LiZhenCheng9527 LiZhenCheng9527 commented Jul 19, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:
waypoint should not managed by Kmesh
Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@kmesh-bot kmesh-bot added the kind/bug Something isn't working label Jul 19, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 19, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.62%. Comparing base (eb828ce) to head (acf10ad).
Report is 30 commits behind head on main.

Files Coverage Δ
pkg/controller/manage/kmesh_manage.go 63.15% <100.00%> (+2.49%) ⬆️

... and 3 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4a0534f...acf10ad. Read the comment docs.

@LiZhenCheng9527
waypoint should not managed by Kmesh
acf10ad 
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
hzxuzhonghu
hzxuzhonghu reviewed Jul 19, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@hzxuzhonghu hzxuzhonghu left a comment

Choose a reason for hiding this comment

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

/lgtm

I checked CNI plugin, where we use checkKmesh. It is quite different from here.

I would like to align with that, it is more resilient

@kmesh-bot kmesh-bot added the lgtm label Jul 19, 2024
@hzxuzhonghu
Copy link
Copy Markdown
Member

hzxuzhonghu commented Jul 19, 2024

/approve

@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

[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

Details 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

@hzxuzhonghu
Copy link
Copy Markdown
Member

hzxuzhonghu commented Jul 19, 2024

/cherry-pick release-0.4

@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

@hzxuzhonghu: once the present PR merges, I will cherry-pick it on top of release-0.4 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-0.4

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/test-infra repository.

@kmesh-bot kmesh-bot merged commit 0d2e1af into kmesh-net:main Jul 19, 2024
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

@hzxuzhonghu: #611 failed to apply on top of branch "release-0.4":

Applying: waypoint should not managed by Kmesh
Using index info to reconstruct a base tree...
M	pkg/controller/manage/kmesh_manage.go
M	pkg/controller/manage/kmesh_manage_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/manage/kmesh_manage_test.go
CONFLICT (content): Merge conflict in pkg/controller/manage/kmesh_manage_test.go
Auto-merging pkg/controller/manage/kmesh_manage.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 waypoint should not managed by Kmesh
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-0.4

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/test-infra repository.

@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

@hzxuzhonghu: new issue created for failed cherrypick: #612

Details

In response to this:

/cherry-pick release-0.4

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/test-infra repository.

@kmesh-bot kmesh-bot mentioned this pull request Jul 19, 2024
Closed
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

@hzxuzhonghu: #611 failed to apply on top of branch "release-0.4":

Applying: waypoint should not managed by Kmesh
Using index info to reconstruct a base tree...
M	pkg/controller/manage/kmesh_manage.go
M	pkg/controller/manage/kmesh_manage_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/manage/kmesh_manage_test.go
CONFLICT (content): Merge conflict in pkg/controller/manage/kmesh_manage_test.go
Auto-merging pkg/controller/manage/kmesh_manage.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 waypoint should not managed by Kmesh
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-0.4

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/test-infra repository.

@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 19, 2024

@hzxuzhonghu: new issue created for failed cherrypick: #613

Details

In response to this:

/cherry-pick release-0.4

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/test-infra repository.

@kmesh-bot kmesh-bot mentioned this pull request Jul 19, 2024
Closed
@LiZhenCheng9527 LiZhenCheng9527 mentioned this pull request Jul 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hzxuzhonghu hzxuzhonghu hzxuzhonghu left review comments

@kwb0523 kwb0523 Awaiting requested review from kwb0523

@supercharge-xsy supercharge-xsy Awaiting requested review from supercharge-xsy

Assignees

@hzxuzhonghu hzxuzhonghu

Labels

approved cherrypick/release-0.4 kind/bug Something isn't working lgtm size/L

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@LiZhenCheng9527 @hzxuzhonghu @kmesh-bot