search

kmesh-net / kmesh

High Performance ServiceMesh Data Plane Based on Programmable Kernel
https://kmesh.net
Apache License 2.0
456 stars 69 forks source link

[release-0.4] Fix namespaced waypoint service itself contains waypoint address, cau… #683

Closed kmesh-bot closed 2 months ago

kmesh-bot commented 3 months ago

Manual cherrypick required.

659 failed to apply on top of branch "release-0.4":

Applying: Fix namespaced waypoint service itself contains waypoint address, cause deadloop
Using index info to reconstruct a base tree...
M   pkg/controller/workload/workload_processor.go
M   pkg/controller/workload/workload_processor_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/workload/workload_processor_test.go
CONFLICT (content): Merge conflict in pkg/controller/workload/workload_processor_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 namespaced waypoint service itself contains waypoint address, cause deadloop
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".
LiZhenCheng9527 commented 2 months ago

/close

kmesh-bot commented 2 months ago

@LiZhenCheng9527: Closing this issue.

In response to [this](https://github.com/kmesh-net/kmesh/issues/683#issuecomment-2309742449): >/close Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.