Skip to content

Conversation

fatedier
Copy link
Contributor

@fatedier fatedier commented Jan 16, 2024

Please provide a description of this PR:
Fix #45241
Fix #48228

@fatedier fatedier requested a review from a team as a code owner January 16, 2024 08:44
@istio-policy-bot istio-policy-bot added area/networking release-notes-none Indicates a PR that does not require release notes. labels Jan 16, 2024
@istio-policy-bot
Copy link

😊 Welcome @fatedier! This is either your first contribution to the Istio istio repo, or it's been
a while since you've been here.

You can learn more about the Istio working groups, Code of Conduct, and contribution guidelines
by referring to Contributing to Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 16, 2024
Copy link
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 please add a release note

@fatedier fatedier removed the release-notes-none Indicates a PR that does not require release notes. label Jan 16, 2024
@fatedier fatedier force-pushed the fix-ep branch 2 times, most recently from 33b7d62 to 4c092cf Compare January 16, 2024 12:14
Copy link
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, leave to @howardjohn

@istio-testing istio-testing merged commit 6728c88 into istio:master Jan 16, 2024
@fatedier fatedier added cherrypick/release-1.20 Set this label on a PR to auto-merge it to the release-1.20 branch cherrypick/release-1.19 Set this label on a PR to auto-merge it to the release-1.19 branch labels Jan 17, 2024
@istio-testing
Copy link
Collaborator

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

Applying: add ip filter logic in GetProxyServiceTargets
Using index info to reconstruct a base tree...
M	pilot/pkg/serviceregistry/kube/controller/controller_test.go
M	pilot/pkg/serviceregistry/kube/controller/endpointslice.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/serviceregistry/kube/controller/endpointslice.go
CONFLICT (content): Merge conflict in pilot/pkg/serviceregistry/kube/controller/endpointslice.go
Auto-merging pilot/pkg/serviceregistry/kube/controller/controller_test.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 add ip filter logic in GetProxyServiceTargets
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

@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.20 from head istio-testing:cherry-pick-48814-to-release-1.20: 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-48814-to-release-1.20."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

liwenhao0810 pushed a commit to liwenhao0810/istio that referenced this pull request Feb 1, 2024
thedebugger pushed a commit to thedebugger/istio that referenced this pull request Mar 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/networking cherrypick/release-1.19 Set this label on a PR to auto-merge it to the release-1.19 branch cherrypick/release-1.20 Set this label on a PR to auto-merge it to the release-1.20 branch size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Istiod appears to erroneously generate conflicting inbound listener GetProxyServiceInstances has questionable logic
5 participants