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

[release-1.21] Fix setting the merged service to servicesByHostname #50730

Closed
istio-testing opened this issue Apr 29, 2024 · 1 comment
Closed
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#50691 failed to apply on top of branch "release-1.21":

Applying: Fix services in SidecarScope.servicesByHostname not equal to SidecarScope.services
Using index info to reconstruct a base tree...
M	pilot/pkg/model/sidecar.go
M	pilot/pkg/model/sidecar_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/model/sidecar_test.go
Auto-merging pilot/pkg/model/sidecar.go
CONFLICT (content): Merge conflict in pilot/pkg/model/sidecar.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 services in SidecarScope.servicesByHostname not equal to SidecarScope.services
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".

@zirain
Copy link
Member

zirain commented May 2, 2024

It isn't necessary

@zirain zirain closed this as completed May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants