Skip to content

fix depolying ns and service waypoint in mixed manner and add related e2e test case#737

Merged
kmesh-bot merged 1 commit intokmesh-net:mainfrom
YaoZengzeng:mixed
Aug 19, 2024
Merged

fix depolying ns and service waypoint in mixed manner and add related e2e test case#737
kmesh-bot merged 1 commit intokmesh-net:mainfrom
YaoZengzeng:mixed

Conversation

@YaoZengzeng
Copy link
Copy Markdown
Member

@YaoZengzeng YaoZengzeng commented Aug 15, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

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

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@YaoZengzeng
fix depolying ns and service waypoint in mixed manner and add related…
b688a3c 
… e2e test case

Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
@kmesh-bot kmesh-bot added the kind/bug Something isn't working label Aug 15, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 15, 2024 •
edited
Loading

Codecov Report

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

Project coverage is 51.75%. Comparing base (c016c29) to head (b688a3c).
Report is 53 commits behind head on main.

Files Patch % Lines
pkg/controller/workload/workload_processor.go 66.66% 1 Missing and 1 partial ⚠️
Files Coverage Δ
pkg/controller/workload/workload_processor.go 63.35% <66.66%> (-0.05%) ⬇️

... 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 74ff6c8...b688a3c. Read the comment docs.

@YaoZengzeng
Copy link
Copy Markdown
Member Author

YaoZengzeng commented Aug 15, 2024

@hzxuzhonghu PTAL

@YaoZengzeng
Copy link
Copy Markdown
Member Author

YaoZengzeng commented Aug 19, 2024

ping @hzxuzhonghu

hzxuzhonghu
hzxuzhonghu approved these changes Aug 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

@kmesh-bot kmesh-bot added the lgtm label Aug 19, 2024
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Aug 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

@kmesh-bot kmesh-bot merged commit 88a8df4 into kmesh-net:main Aug 19, 2024
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Aug 19, 2024

In response to a cherrypick label: #737 failed to apply on top of branch "release-0.4":

Applying: fix depolying ns and service waypoint in mixed manner and add related e2e test case
Using index info to reconstruct a base tree...
M	pkg/controller/workload/workload_processor.go
M	test/e2e/baseline_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/baseline_test.go
CONFLICT (content): Merge conflict in test/e2e/baseline_test.go
Auto-merging pkg/controller/workload/workload_processor.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 fix depolying ns and service waypoint in mixed manner and add related e2e test case
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".

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

kmesh-bot commented Aug 19, 2024

In response to a cherrypick label: new issue created for failed cherrypick: #751

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hzxuzhonghu hzxuzhonghu hzxuzhonghu approved these changes

@bitcoffeeiux bitcoffeeiux Awaiting requested review from bitcoffeeiux

Assignees

@hzxuzhonghu hzxuzhonghu

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

failed to access when deploying waypoints of various granulairties in a mixed manner

3 participants

@YaoZengzeng @kmesh-bot @hzxuzhonghu