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.

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

Add tagged gateways to status and XDS #54465

Merged
merged 22 commits into from
Jan 22, 2025
Merged

Add tagged gateways to status and XDS #54465

merged 22 commits into from
Jan 22, 2025

Conversation

therealmitchconnors
Copy link
Contributor

@therealmitchconnors therealmitchconnors commented Dec 24, 2024 •
edited by istio-policy-bot
Loading

Please provide a description of this PR:
This is a partial fix for #54458

@therealmitchconnors therealmitchconnors requested review from a team as code owners December 24, 2024 00:43
@istio-testing istio-testing added the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Dec 24, 2024
@istio-policy-bot istio-policy-bot added area/ambient Issues related to ambient mesh area/user experience labels Dec 24, 2024
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 24, 2024
@therealmitchconnors
Copy link
Contributor Author

/retest

@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 3, 2025
@therealmitchconnors
Copy link
Contributor Author

/retest

@therealmitchconnors
Copy link
Contributor Author

/retest

@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 10, 2025
howardjohn
howardjohn reviewed Jan 16, 2025
View reviewed changes
pilot/pkg/config/kube/crdclient/client.go Outdated Show resolved Hide resolved
pilot/pkg/config/kube/gateway/controller.go Outdated Show resolved Hide resolved
pkg/kube/controllers/queue.go Outdated Show resolved Hide resolved
pkg/revisions/tag_watcher.go Show resolved Hide resolved
@therealmitchconnors therealmitchconnors requested a review from a team as a code owner January 17, 2025 17:07
@therealmitchconnors therealmitchconnors changed the title WIP: Add tagged gateways to status Add tagged gateways to status and XDS Jan 17, 2025
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jan 17, 2025
@istio-testing istio-testing merged commit 4836653 into istio:master Jan 22, 2025
28 checks passed
@therealmitchconnors therealmitchconnors added cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch labels Jan 24, 2025
@istio-testing
Copy link
Collaborator

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

Applying: Add tagged gateways to status
Using index info to reconstruct a base tree...
M	pilot/pkg/config/kube/crdclient/client.go
M	pkg/config/model.go
M	pkg/test/framework/components/ambient/waypoint.go
M	tests/integration/ambient/main_test.go
M	tests/integration/ambient/waypoint_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/ambient/waypoint_test.go
CONFLICT (content): Merge conflict in tests/integration/ambient/waypoint_test.go
Auto-merging tests/integration/ambient/main_test.go
Auto-merging pkg/test/framework/components/ambient/waypoint.go
Auto-merging pkg/config/model.go
Auto-merging pilot/pkg/config/kube/crdclient/client.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add tagged gateways to status

@istio-testing
Copy link
Collaborator

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

@istio-testing istio-testing mentioned this pull request Jan 24, 2025
Open
@istio-testing
Copy link
Collaborator

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

Applying: Add tagged gateways to status
Using index info to reconstruct a base tree...
M	pilot/pkg/config/kube/crdclient/client.go
M	pkg/config/model.go
M	pkg/test/framework/components/ambient/waypoint.go
M	tests/integration/ambient/main_test.go
M	tests/integration/ambient/waypoint_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/ambient/waypoint_test.go
CONFLICT (content): Merge conflict in tests/integration/ambient/waypoint_test.go
Auto-merging tests/integration/ambient/main_test.go
Auto-merging pkg/test/framework/components/ambient/waypoint.go
Auto-merging pkg/config/model.go
Auto-merging pilot/pkg/config/kube/crdclient/client.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add tagged gateways to status

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request created: #54855

@istio-testing istio-testing mentioned this pull request Jan 24, 2025
Merged
@istio-testing
Copy link
Collaborator

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

@istio-testing istio-testing mentioned this pull request Jan 24, 2025
Open
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request could not be created: failed to create pull request against istio/istio#release-1.24 from head istio-testing:cherry-pick-54465-to-release-1.24: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for istio-testing:cherry-pick-54465-to-release-1.24."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

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

@howardjohn howardjohn howardjohn approved these changes

@costinm costinm Awaiting requested review from costinm

@linsun linsun Awaiting requested review from linsun

@stevenctl stevenctl Awaiting requested review from stevenctl

@keithmattix keithmattix Awaiting requested review from keithmattix

@hzxuzhonghu hzxuzhonghu Awaiting requested review from hzxuzhonghu

Assignees
No one assigned
Labels
area/ambient Issues related to ambient mesh area/user experience cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@therealmitchconnors @istio-testing @howardjohn @istio-policy-bot