Skip to content

istioctl tag respect revision #38467

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 21, 2022
Merged

istioctl tag respect revision #38467

merged 1 commit into from
Apr 21, 2022

Conversation

zirain
Copy link
Member

@zirain zirain commented Apr 20, 2022 •
edited by istio-policy-bot
Loading

Please provide a description of this PR:

fix #38453

@zirain zirain requested review from a team as code owners April 20, 2022 01:46
@istio-policy-bot
Copy link

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@istio-policy-bot istio-policy-bot added area/environments area/user experience release-notes-none Indicates a PR that does not require release notes. labels Apr 20, 2022
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 20, 2022
@zirain
Copy link
Member Author

zirain commented Apr 20, 2022

/test unit-tests_istio

litong01
litong01 approved these changes Apr 20, 2022
View reviewed changes
Copy link
Contributor

@litong01 litong01 left a comment

Choose a reason for hiding this comment

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

Thanks.

@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 20, 2022
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 21, 2022
@istio-testing istio-testing merged commit b37dcd6 into istio:master Apr 21, 2022
@zirain zirain deleted the istioctl-tag branch April 21, 2022 06:20
@istio-testing
Copy link
Collaborator

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

Applying: istioctl tag respect revision
Using index info to reconstruct a base tree...
M	pkg/config/analysis/local/istiod_analyze.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/analysis/local/istiod_analyze.go
CONFLICT (content): Merge conflict in pkg/config/analysis/local/istiod_analyze.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 istioctl tag respect revision
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".

@istio-testing istio-testing mentioned this pull request Apr 21, 2022
Closed
@istio-testing
Copy link
Collaborator

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

This was referenced Apr 26, 2022
Closed
Closed
@zirain zirain mentioned this pull request Aug 4, 2022
Merged
@zirain zirain mentioned this pull request Nov 5, 2022
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanxiaop hanxiaop hanxiaop approved these changes

+2 more reviewers

@litong01 litong01 litong01 approved these changes

@GregHanson GregHanson GregHanson approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
area/environments area/user experience release-notes-none Indicates a PR that does not require release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Istioctl tag command can't find control plane service
6 participants
@zirain @istio-policy-bot @istio-testing @litong01 @GregHanson @hanxiaop